Changeset 349e5e8 in git

Timestamp:

Oct 6, 2016, 12:08:21 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

897e2e43913ec1dc7066b12c83a53cc2690728c0

Parents:

7bb1ac4627f442f9075c2c48d08a79705295f950

Message:

fix: overflow check in std, p2: kInterRed (and similiar): fix tr.#774

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (1 diff)
• kstd1.cc (modified) (2 diffs)
• kstd2.cc (modified) (3 diffs)

kernel/GBEngine/kspoly.cc

@@ -103 +103 @@
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
 
-  if (tailRing != currRing)
+  //if (tailRing != currRing)
   {
     // check that reduction does not violate exp bound

kernel/GBEngine/kstd1.cc

@@ -3493 +3493 @@
   {
     completeReduce(strat);
-#ifdef HAVE_TAIL_RING
     if (strat->completeReduce_retry)
     {
@@ -3503 +3502 @@
       for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
       completeReduce(strat);
-    }
-#endif
+      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)
+        {
+          strat->completeReduce_retry=FALSE;
+          cleanT(strat);strat->tailRing=currRing;
+          int i;
+          for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
+          completeReduce(strat);
+        }
+        if (strat->completeReduce_retry)
+#endif
+          Werror("exponent bound is %ld",currRing->bitmask);
+      }
+    }
   }
   else if (TEST_OPT_PROT) PrintLn();
+
 
   /* release temp data-------------------------------- */

kernel/GBEngine/kstd2.cc

@@ -3209 +3209 @@
   {
     completeReduce(strat);
-#ifdef HAVE_TAIL_RING
     if (strat->completeReduce_retry)
     {
@@ -3215 +3214 @@
       // 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;
-      completeReduce(strat);
-    }
-#endif
+#ifdef HAVE_TAIL_RING
+      if(currRing->bitmask>strat->tailRing->bitmask)
+      {
+        strat->completeReduce_retry=FALSE;
+        cleanT(strat);strat->tailRing=currRing;
+        int i;
+        for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
+        completeReduce(strat);
+      }
+      if (strat->completeReduce_retry)
+#endif
+        Werror("exponent bound is %ld",currRing->bitmask);
+    }
   }
   else if (TEST_OPT_PROT) PrintLn();
@@ -4306 +4312 @@
       // 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;
-      completeReduce(strat, TRUE);
+#ifdef HAVE_TAIL_RING
+      if(currRing->bitmask>strat->tailRing->bitmask)
+      {
+        strat->completeReduce_retry=FALSE;
+        cleanT(strat);strat->tailRing=currRing;
+        int i;
+        for(i=strat->sl;i>=0;i--) strat->S_2_R[i]=-1;
+        completeReduce(strat);
+      }
+      if (strat->completeReduce_retry)
+#endif
+        Werror("exponent bound is %ld",currRing->bitmask);
     }
   }