Changeset c7afb70 in git

Timestamp:

Feb 13, 2006, 3:54:59 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

924ccae622403cc293c01a328e2645f0bb90d465

Parents:

27fef2babf54089447202fc5e5c43588c22c4d49

Message:

*hannes: no USE_COEF_BUCKETS: tests


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

File:

• kernel/kbuckets.cc (modified) (11 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.22 2006-02-13 12:37:02 Singular Exp $ */
+/* $Id: kbuckets.cc,v 1.23 2006-02-13 14:54:59 Singular Exp $ */
 
 #include "mod2.h"
@@ -126 +126 @@
       dReportError("Bucket %d larger or equal than lm", i);
       if (p_LmCmp(lm, bucket->buckets[i], bucket->bucket_ring) ==0)
-      dReportError("Bucket %d equal to lm", i);
+        dReportError("Bucket %d equal to lm", i);
       return FALSE;
     }
@@ -144 +144 @@
     }
   }
-  for(i=0;i<=MAX_BUCKET;i++){
-    if (bucket->buckets[i]!=NULL){
-        int j;
-        for(j=i+1;j<=MAX_BUCKET;j++){
-            if (bucket->buckets[j]==bucket->buckets[i])
-                dReportError("Bucket %d %d equal", i,j);
-                return FALSE;
+  for(i=0;i<=MAX_BUCKET;i++)
+  {
+    if (bucket->buckets[i]!=NULL)
+    {
+      int j;
+      for(j=i+1;j<=MAX_BUCKET;j++)
+      {
+        if (bucket->buckets[j]==bucket->buckets[i])
+        {
+          dReportError("Bucket %d %d equal", i,j);
+          return FALSE;
         }
-    }
-    if (bucket->coef[i]!=NULL){
-        int j;
-        for(j=i+1;j<=MAX_BUCKET;j++){
-            if (bucket->coef[j]==bucket->coef[i])
-                dReportError("internal coef %d %d equal", i,j);
-                return FALSE;
+      }
+    }
+    if (bucket->coef[i]!=NULL)
+    {
+      int j;
+      for(j=i+1;j<=MAX_BUCKET;j++)
+      {
+        if (bucket->coef[j]==bucket->coef[i])
+        {
+          dReportError("internal coef %d %d equal", i,j);
+          return FALSE;
         }
-        for(j=0;j<=MAX_BUCKET;j++){
-            if (bucket->coef[j]==bucket->coef[i])
-                dReportError("internal coef %d equals bucket %d", i,j);
-                return FALSE;
-        }
-    }
-  }
-  assume(bucket->buckets_used<=MAX_BUCKET);
+      }
+    }
+  }
   return TRUE;
 }
@@ -225 +228 @@
 inline void kBucketMergeLm(kBucket_pt bucket)
 {
-
+  kbTest(bucket);
   if (bucket->buckets[0] != NULL)
   {
@@ -257 +260 @@
     if (i > bucket->buckets_used)  bucket->buckets_used = i;
     assume(i!=0);
-    if (bucket->buckets[i]!=NULL){
+    if (bucket->buckets[i]!=NULL)
+    {
        MULTIPLY_BUCKET(bucket,i);
        pNext(lm) = bucket->buckets[i];
@@ -263 +267 @@
        bucket->buckets_length[i]++;
        assume(i <= bucket->buckets_used+1);
-
-    } else {
+    }
+    else
+    {
       #if 1
        assume(bucket->buckets[i]==NULL);
@@ -279 +284 @@
        bucket->buckets[i]=lm;
        bucket->buckets_length[i]=1;
-       #else
+      #else
        MULTIPLY_BUCKET(bucket,i);
        pNext(lm) = bucket->buckets[i];
@@ -285 +290 @@
        bucket->buckets_length[i]++;
        assume(i <= bucket->buckets_used+1);
-       #endif
+      #endif
     }
     bucket->buckets[0]=NULL;
@@ -351 +356 @@
   bucket->buckets[1] = NULL;
   bucket->buckets_length[1] = 0;
-  assume(bucket->coef[1]==NULL);
+  #ifdef USE_COEF_BUCKETS
+    assume(bucket->coef[1]==NULL);
+  #endif
   ring r=bucket->bucket_ring;
 
@@ -398 +405 @@
   }
   bucket->buckets_used = i;
-  assume(bucket->coef[0]==NULL);
-  assume(bucket->coef[i]==NULL);
+  assume(bucket->buckets_used <= MAX_BUCKET);
+  #ifdef USE_COEF_BUCKETS
+    assume(bucket->coef[0]==NULL);
+    assume(bucket->coef[i]==NULL);
+  #endif
   assume(pLength(p) == (int) pl);
   kbTest(bucket);
@@ -645 +655 @@
     bucket->buckets_length[i] = 0;
     i = pLogLength(l1);
+    assume(i<= MAX_BUCKET);
+    assume(bucket->buckets_used<= MAX_BUCKET);
   }
 
   bucket->buckets[i] = q;
   bucket->buckets_length[i]=l1;
+  kbTest(bucket);
   if (i >= bucket->buckets_used)
     bucket->buckets_used = i;