Changeset a12d11 in git

Timestamp:

Sep 16, 2014, 4:19:13 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

86950236405247b95fce3e0e4496f283d7fbcc5a

Parents:

1b62751a4d0f3f4b875f0161483c1a86cc1e1ebf

Message:

fix: handling of sugar in slimgb (from master)

Location:

kernel/GBEngine

Files:

• tgb.cc (modified) (8 diffs)
• tgb_internal.h (modified) (1 diff)

kernel/GBEngine/tgb.cc

@@ -476 +476 @@
 }
 
-wlen_type kEBucketLength (kBucket * b, poly lm, int /*sugar*/, slimgb_alg * ca)
+wlen_type kEBucketLength (kBucket * b, poly lm, slimgb_alg * ca)
 {
   wlen_type s = 0;
@@ -612 +612 @@
 #endif
       //FIXME:not quadratic
-      wlen_type erg = kEBucketLength (this->bucket, this->p, this->sugar, c);
+      wlen_type erg = kEBucketLength (this->bucket, this->p, c);
       //erg*=cs;//for quadratic
       erg *= cs;
@@ -626 +626 @@
     if(c->eliminationProblem)
       //if (false)
-      s = kEBucketLength (this->bucket, this->p, this->sugar, c);
+      s = kEBucketLength (this->bucket, this->p, c);
     else
       s = bucket_guess (bucket);
@@ -2858 +2858 @@
     buf[j].bucket = kBucketCreate (currRing);
     p_Test (p[j], c->r);
-    if(c->eliminationProblem)
-    {
-      buf[j].sugar = c->pTotaldegree_full (p[j]);
-    }
     int len = pLength (p[j]);
     kBucketInit (buf[j].bucket, buf[j].p, len);
@@ -4340 +4336 @@
     int old_length = c->strat->lenS[j]; // in view of S
     los[bp].p = p;
-    if(c->eliminationProblem)
-    {
-      los[bp].sugar = c->pTotaldegree_full (p);
-    }
     kBucketInit (los[bp].bucket, p, old_length);
     wlen_type qal = pQuality (clear_into, c, new_length);
@@ -4509 +4501 @@
     assume ((i == losl - 1) || (pLmCmp (los[i].p, los[i + 1].p) <= 0));
     assume (is_valid_ro (los[i]));
-    assume ((!(c->eliminationProblem))
-            || (los[i].sugar >= c->pTotaldegree (los[i].p)));
     j = kFindDivisibleByInS_easy (strat, los[i]);
     if(j >= 0)
@@ -4901 +4891 @@
   {
     this->do_reduce (r[i]);
-    if(c->eliminationProblem)
-    {
-      r[i].sugar = si_max (r[i].sugar, reducer_deg);
-    }
   }
   for(i = l; i <= u; i++)
@@ -4956 +4942 @@
     }
     pNormalize (red);
-    if(c->eliminationProblem)
-    {
-      r[rn].sugar = c->pTotaldegree_full (red);
-    }
 
     if((!(erg.fromS)) && (TEST_V_UPTORADICAL))

kernel/GBEngine/tgb_internal.h

@@ -292 +292 @@
   poly p;
   unsigned long sev;
-  int sugar;
   void flatten();
   void validate();