Changeset f224d85 in git for libpolys

Timestamp:

Sep 24, 2012, 2:52:20 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

92296297754bdb3c65ffad980c8e982ef37cf33b

Parents:

abe5c8b5ebdd2be025cd137e4a089c3780efb8a3

Message:

fix: removing last from p_*templates and k* routines

Location:

libpolys/polys/templates

Files:

• p_kBucketSetLm__T.cc (modified) (2 diffs)
• pp_Mult_mm__T.cc (modified) (3 diffs)

libpolys/polys/templates/p_kBucketSetLm__T.cc

@@ -124 +124 @@
   DECLARE_ORDSGN(const long* ordsgn = r->ordsgn);
   poly p=NULL;
-  while(p==NULL){
-      int found=-1000;
-       for (int i = 1; i<=bucket->buckets_used; i++)
+  while(p==NULL)
+  {
+    int found=-1000;
+    for (int i = 1; i<=bucket->buckets_used; i++)
+    {
+      if (bucket->buckets[i] != NULL)
+      {
+        if (p == NULL)
         {
-          if (bucket->buckets[i] != NULL)
-          {
-           
-            if (p == NULL)
-            {
-                p=bucket->buckets[i];
-                found=i;
-                continue;
-            }
-            assume(p != NULL);
-            p_MemCmp__T(bucket->buckets[i]->exp, p->exp, length, ordsgn, goto Continue, goto Greater, goto Continue);
-            //assume(p_LmCmp(bucket->buckets[i],p,r)==1);
-          Greater:
-            //if (p_LmCmp(bucket->buckets[i],p,r)!=1) continue;
-            found=i;
-            p=bucket->buckets[i];
-          Continue:;
-          }
+          p=bucket->buckets[i];
+          found=i;
+          continue;
         }
-      
-      
-      if (found<0) return;
-      assume(p==bucket->buckets[found]);
-      assume(p!=NULL);
-      
-      p=kBucketExtractLmOfBucket(bucket, found);
-      assume(p!=NULL);
-      p_Test(p,r);
-      poly copy=p_LmInit(p, r);
-      
-      for (int i = found+1; i<=bucket->buckets_used; i++)
-        {
-          
-          if (bucket->buckets[i] != NULL)
-          {
-            if(p_LmEqual(bucket->buckets[i], copy,r)){
-                poly q=kBucketExtractLmOfBucket(bucket,i);
-                assume(p!=q);
-                p=p_Add_q(p, q,r);
-                assume(pLength(bucket->buckets[i])==bucket->buckets_length[i]);
-            }
-            
-    
-            
-          }
+        assume(p != NULL);
+        p_MemCmp__T(bucket->buckets[i]->exp, p->exp, length, ordsgn, goto Continue, goto Greater, goto Continue);
+        //assume(p_LmCmp(bucket->buckets[i],p,r)==1);
+        Greater:
+        //if (p_LmCmp(bucket->buckets[i],p,r)!=1) continue;
+        found=i;
+        p=bucket->buckets[i];
+        Continue:;
+      }
+    }
+    if (found<0) return;
+    assume(p==bucket->buckets[found]);
+    assume(p!=NULL);
+
+    p=kBucketExtractLmOfBucket(bucket, found);
+    assume(p!=NULL);
+    p_Test(p,r);
+    poly copy=p_LmInit(p, r);
+
+    for (int i = found+1; i<=bucket->buckets_used; i++)
+    {
+      if (bucket->buckets[i] != NULL)
+      {
+        if(p_LmEqual(bucket->buckets[i], copy,r))
+        {
+          poly q=kBucketExtractLmOfBucket(bucket,i);
+          assume(p!=q);
+          p=p_Add_q(p, q,r);
+          assume(pLength(bucket->buckets[i])==bucket->buckets_length[i]);
         }
-        p_Delete(&copy, r);
+      }
+    }
+    p_Delete(&copy, r);
   }
- 
+
   //assume(bucket->buckets[j] != NULL);
-  assume(pLength(p)==1);
-  lt = p;
-  
+  assume(pLength(lt)==1);
+
   bucket->buckets[0] = lt;
   bucket->buckets_length[0] = 1;
@@ -186 +180 @@
   kBucketAdjustBucketsUsed(bucket);
   kbTest(bucket);
-  }
+}
 #endif

libpolys/polys/templates/pp_Mult_mm__T.cc

@@ -15 +15 @@
  *
  ***************************************************************/
-LINKAGE poly pp_Mult_mm__T(poly p, const poly m, const ring ri, poly &last)
+LINKAGE poly pp_Mult_mm__T(poly p, const poly m, const ring ri)
 {
   p_Test(p, ri);
@@ -21 +21 @@
   if (p == NULL)
   {
-    last = NULL;      
     return NULL;
   }
@@ -56 +55 @@
   }
   while (p != NULL);
-  last = q;
   pNext(q) = NULL;