Changeset 53b958 in git for libpolys/polys/sbuckets.cc

Timestamp:

Jul 11, 2017, 3:56:14 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

1db9b885833c9bc3c788222ea86a3769214a2cc9

Parents:

209f33816aa1d5cfd9ec07dc5a4859846626d3c8

Message:

add; sBucket_Add_m, sBucket_Merge_m

File:

• libpolys/polys/sbuckets.cc (modified) (4 diffs)

libpolys/polys/sbuckets.cc

@@ -152 +152 @@
 //
 
-static void sBucket_Merge_m(sBucket_pt bucket, poly p)
+void sBucket_Merge_m(sBucket_pt bucket, poly p)
 {
   assume(p != NULL && pNext(p) == NULL);
@@ -198 +198 @@
 }
 
-void sBucket_Add_p(sBucket_pt bucket, poly p, int length)
+void sBucket_Add_m(sBucket_pt bucket, poly p)
 {
   assume(bucket != NULL);
-  assume(length <= 0 || length == pLength(p));
-
-  if (p == NULL) return;
-  if (length <= 0) length = pLength(p);
-
-  int i = LOG2(length);
+  assume(1 == pLength(p));
+
+  int length = 1;
+
+  int i = 0; //LOG2(length);
 
   while (bucket->buckets[i].p != NULL)
@@ -227 +226 @@
 }
 
+void sBucket_Add_p(sBucket_pt bucket, poly p, int length)
+{
+  assume(bucket != NULL);
+  assume(length <= 0 || length == pLength(p));
+
+  if (p == NULL) return;
+  if (length <= 0) length = pLength(p);
+
+  int i = LOG2(length);
+
+  while (bucket->buckets[i].p != NULL)
+  {
+    p = p_Add_q(p, bucket->buckets[i].p, length, bucket->buckets[i].length,
+                bucket->bucket_ring);
+    bucket->buckets[i].p = NULL;
+    bucket->buckets[i].length = 0;
+    if (p==NULL)
+    {
+      if (i > bucket->max_bucket) bucket->max_bucket = i;
+      return;
+    }
+    i = LOG2(length);
+  }
+
+  bucket->buckets[i].p = p;
+  bucket->buckets[i].length = length;
+  if (i > bucket->max_bucket) bucket->max_bucket = i;
+}
+
 // Converts SBpoly into a poly and clears bucket
 // i.e., afterwards SBpoly == 0
@@ -375 +403 @@
   {
     pNext(p) = NULL;
-    sBucket_Add_p(bucket, p, 1);
+    sBucket_Add_m(bucket, p);
     p = pn;
     if (p == NULL) break;