Changeset 111a66 in git

Timestamp:

Sep 21, 2004, 8:28:29 PM (20 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

481ed7f68993bf02f4d42dd61ae707209d68f66d

Parents:

ccf647a6cd257d5e48da01b6035ada913fcf5202

Message:

*bricken: new qsort, binary searcg algorithm for checking wether a leading term is new


git-svn-id: file:///usr/local/Singular/svn/trunk@7485 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/tgb.cc (modified) (3 diffs)

Singular/tgb.cc

@@ -107 +107 @@
   if(p1->f>p2->f) return 1;
   if(p1->f<p2->f) return -1;  
-  int c=pLmCmp(p1->f,p2->f);
-  if (c !=0) return c;
-  c=pLmCmp(p1->m,p2->m);
-  return c;
+
+  return pLmCmp(p1->m,p2->m);
+ 
 }
 static int pLmCmp_func(const void* ap1, const void* ap2){
@@ -2775 +2774 @@
 
   //better algorithm replace p by its monoms, qsort,delete duplicates and binary search for testing if monom is contained in array
- 
+  qsort(p, p_index,sizeof(poly),pLmCmp_func);
+  for(i=0;i<p_index;i++)
+    pDelete(&p[i]->next);
   for(i=m_index-1;i>=0;--i)
   {
     int j;
+    int pos=posInPolys (p,p_index, m[i],c);
     BOOLEAN minus=FALSE;
-    for(j=0;j<p_index;j++)
-      if (pLmEqual(p[j],m[i]))
-      {
-        minus=TRUE;
-        break;
-      }
+    if(((p_index>pos)&&(pLmEqual(m[i],p[pos]))) ||(pos>0) &&(pLmEqual(m[i],p[pos-1])))
+      minus=TRUE;
+   
     if(minus)
     {
@@ -2797 +2796 @@
     }
   }
+
+//   for(i=m_index-1;i>=0;--i)
+//   {
+//     int j;
+//     BOOLEAN minus=FALSE;
+//     for(j=0;j<p_index;j++)
+//       if (pLmEqual(p[j],m[i]))
+//       {
+//      minus=TRUE;
+//      break;
+//       }
+//     if(minus)
+//     {
+//       F_minus[F_minus_index++]=m[i];
+//       m[i]=NULL;
+//     }
+//     else
+//     {
+//       F_plus[F_plus_index++]=m[i];
+//       m[i]=NULL;
+//     }
+//   }
   //in this order F_minus will be automatically ascending sorted
   //to make this sure for foreign gauss