Changeset f26b42 in git for kernel/GBEngine/kstd2.cc

Timestamp:

Oct 6, 2016, 10:46:20 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7bb1ac4627f442f9075c2c48d08a79705295f950

Parents:

4aaf5920e25e841ccd0432b72d165b4d869a69bc

Message:

fix: overflow check in std, p1: completeReduce

File:

• kernel/GBEngine/kstd2.cc (modified) (3 diffs)

kernel/GBEngine/kstd2.cc

@@ -2276 +2276 @@
   {
     completeReduce(strat);
-#ifdef HAVE_TAIL_RING
     if (strat->completeReduce_retry)
     {
@@ -2282 +2281 @@
       // 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();
-  if(nCoeff_is_Ring_Z(currRing->cf))
-    finalReduceByMon(strat);
-  if(rField_is_Ring(currRing))
-  {
-    for(int i = 0;i<=strat->sl;i++)
-    {
-      if(!nGreaterZero(pGetCoeff(strat->S[i])))
-      {
-        strat->S[i] = pNeg(strat->S[i]);
+  if (!errorreported)
+  {
+    if(nCoeff_is_Ring_Z(currRing->cf))
+      finalReduceByMon(strat);
+    if(rField_is_Ring(currRing))
+    {
+      for(int i = 0;i<=strat->sl;i++)
+      {
+        if(!nGreaterZero(pGetCoeff(strat->S[i])))
+        {
+          strat->S[i] = pNeg(strat->S[i]);
+        }
       }
     }
@@ -2315 +2324 @@
   if ((TEST_OPT_PROT) || (TEST_OPT_DEBUG)) messageStat(hilbcount,strat);
   SI_RESTORE_OPT1(save);
-  if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
+  if ((Q!=NULL)&&(!errorreported)) updateResult(strat->Shdl,Q,strat);
 
   idTest(strat->Shdl);