Changeset 0b7fb8 in git

Timestamp:

Oct 27, 2014, 9:25:39 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

90fa9df2be3b1096c1cca744ca7a710000600938

Parents:

5bcb3f89f4bab03bd5ec200621f88531ed29cd0b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-27 21:25:39+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-31 17:55:06+01:00

Message:

Added sIsEmpty + fixed *Copy

Location:

libpolys/polys

Files:

• sbuckets.cc (modified) (5 diffs)
• sbuckets.h (modified) (3 diffs)

libpolys/polys/sbuckets.cc

@@ -57 +57 @@
 { return bucket->bucket_ring; }
 
+
+bool sIsEmpty(const sBucket_pt bucket)
+{
+  for(int i = 0; i < (BIT_SIZEOF_LONG - 3); i++)
+  {    
+    assume( i < (BIT_SIZEOF_LONG - 3) );
+    assume( pLength(bucket->buckets[i].p) == bucket->buckets[i].length );
+
+    if( bucket->buckets[i].p != NULL )
+      return false;
+
+    if( bucket->buckets[i].length != 0 )
+      return false;
+  }
+
+  return( bucket->max_bucket == 0 );
+
+}
+
+
 /// Copy sBucket non-intrusive!!!
 sBucket_pt    sBucketCopy(const sBucket_pt bucket)
@@ -64 +84 @@
   sBucket_pt newbucket = sBucketCreate(r);
 
-  for(int i = 0; bucket->buckets[i].p != NULL; i++)
-  {
+  newbucket->max_bucket = bucket->max_bucket;
+
+  for(int i = 0; i <= bucket->max_bucket; i++)
+  {    
     assume( i < (BIT_SIZEOF_LONG - 3) );
     assume( pLength(bucket->buckets[i].p) == bucket->buckets[i].length );
@@ -259 +281 @@
   while (bucket->buckets[i].p == NULL)
   {
+    assume( bucket->buckets[i].length == 0 );
     i++;
     if (i > bucket->max_bucket) goto done;
@@ -265 +288 @@
   pr = bucket->buckets[i].p;
   lr = bucket->buckets[i].length;
+
+  assume( pr != NULL && (lr > 0) );
+  
   bucket->buckets[i].p = NULL;
   bucket->buckets[i].length = 0;
@@ -273 +299 @@
     if (bucket->buckets[i].p != NULL)
     {
+      assume( bucket->buckets[i].length == pLength(bucket->buckets[i].p) );
+      
       pr = p_Add_q(pr, bucket->buckets[i].p, lr, bucket->buckets[i].length,
                    bucket->bucket_ring);
+      
       bucket->buckets[i].p = NULL;
       bucket->buckets[i].length = 0;
     }
-    i++;
-  }
-
-  done:
+
+    assume( bucket->buckets[i].p == NULL );
+    assume( bucket->buckets[i].length == 0 );    
+    i++;
+  }
+
+done:
+  
   *p = pr;
   *length = lr;
+  
   bucket->max_bucket = 0;
-}
+
+  assume( sIsEmpty(bucket) );
+}
+
+
+
 
 /////////////////////////////////////////////////////////////////////////////

libpolys/polys/sbuckets.h

@@ -19 +19 @@
 
 
+
 //////////////////////////////////////////////////////////////////////////
 // Creation/Destruction of buckets
@@ -24 +25 @@
 sBucket_pt    sBucketCreate(ring r);
 void          sBucketDestroy(sBucket_pt *bucket);
-
 
 //////////////////////////////////////////////////////////////////////////
@@ -35 +35 @@
 /// Returns bucket ring
 ring sBucketGetRing(const sBucket_pt bucket);
+
+/// Test whether bucket is empty!?
+bool sIsEmpty(const sBucket_pt bucket);
+
+
 
 /////////////////////////////////////////////////////////////////////////////