Changeset 761e453 in git

Timestamp:

Apr 27, 2018, 11:38:34 AM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f1182f8cdb0e421624b6bd4cb12a67c87b44ec12

Parents:

945000cb5ab9a7e19901cbd2d68659fde7c7b939

Message:

add: sBucket additions: sBucketCanonicalize, sBucketString, sBucketPrint

Location:

libpolys/polys

Files:

• sbuckets.cc (modified) (1 diff)
• sbuckets.h (modified) (1 diff)

libpolys/polys/sbuckets.cc

@@ -398 +398 @@
   return pn;
 }
+
+void sBucketCanonicalize(sBucket_pt bucket)
+{
+  poly pr = NULL;
+  int  lr = 0;
+  int i = 0;
+
+  while (bucket->buckets[i].p == NULL)
+  {
+    assume( bucket->buckets[i].length == 0 );
+    i++;
+    if (i > bucket->max_bucket) goto done;
+  }
+
+  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;
+  i++;
+
+  while (i <= bucket->max_bucket)
+  {
+    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;
+    }
+
+    assume( bucket->buckets[i].p == NULL );
+    assume( bucket->buckets[i].length == 0 );
+    i++;
+  }
+
+done:
+  if (pr!=NULL)
+  {
+    i = SI_LOG2(lr);
+    bucket->buckets[i].p = pr;
+    bucket->buckets[i].length = lr;
+    bucket->max_bucket = i;
+  }
+}
+
+char* sBucketString(sBucket_pt bucket)
+{
+  sBucketCanonicalize(bucket);
+  StringSetS("bucket: ");
+  StringAppendS(p_String(bucket->buckets[bucket->max_bucket].p,bucket->bucket_ring));
+  return StringEndS();
+}
+
+void sBucketPrint(sBucket_pt bucket)
+{
+  sBucketCanonicalize(bucket);
+  PrintS("bucket: ");
+  p_Write(bucket->buckets[bucket->max_bucket].p,bucket->bucket_ring);
+}

libpolys/polys/sbuckets.h

@@ -100 +100 @@
 
 
+void sBucketCanonicalize(sBucket_pt bucket);
+char* sBucketString(sBucket_pt bucket);
+void sBucketPrint(sBucket_pt bucket);
 #endif // P_BUCKET_SORT