Changeset b68503 in git for kernel/GBEngine

Timestamp:

Oct 11, 2016, 3:34:39 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0dc3cbbb3a71c072642a8ab8fd19175731e12816

Parents:

4763e2fe897fe59eb65c374cdfe241efab6d9ab6

Message:

fix: intered: check for overflow of exponents

Location:

kernel/GBEngine

Files:

• kInline.h (modified) (2 diffs)
• kstd1.cc (modified) (1 diff)

kernel/GBEngine/kInline.h

@@ -1091 +1091 @@
 KINLINE poly redtailBba (poly p,int pos,kStrategy strat,BOOLEAN normalize)
 {
-  LObject L(p, currRing, strat->tailRing);
+  LObject L(p);
   return redtailBba(&L, pos, strat,FALSE, normalize);
 }
@@ -1097 +1097 @@
 KINLINE poly redtailBbaBound (poly p,int pos,kStrategy strat,int bound,BOOLEAN normalize)
 {
-  LObject L(p, currRing, strat->tailRing);
+  LObject L(p, currRing, strat->tailRing); // ? L(p); ??
   return redtailBbaBound(&L, pos, strat,bound, FALSE, normalize);
 }

kernel/GBEngine/kstd1.cc

@@ -3496 +3496 @@
     {
       // completeReduce needed larger exponents, retry
-      // to reduce with S (instead of T)
-      // and in currRing (instead of strat->tailRing)
-      cleanT(strat);strat->tailRing=currRing;
-      int i;
-      for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
+      // hopefully: kStratChangeTailRing already provided a larger tailRing
+      //    (otherwise: it will fail again)
       strat->completeReduce_retry=FALSE;
       completeReduce(strat);
       if (strat->completeReduce_retry)
       {
-        // completeReduce needed larger exponents, retry
-        // to reduce with S (instead of T)
-        // and in currRing (instead of strat->tailRing)
 #ifdef HAVE_TAIL_RING
         if(currRing->bitmask>strat->tailRing->bitmask)
         {
+          // retry without T
           strat->completeReduce_retry=FALSE;
           cleanT(strat);strat->tailRing=currRing;