Changeset a969ff in git

Timestamp:

Mar 21, 2016, 2:43:26 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cf5fba9676fd2b05c5b5e85d2a950307c034fd1e

Parents:

770afafee6b4b73035818ab5d72c01d2c9fbd566

Message:

fix: clear common factors in T/S (updateT) after highest corner found

File:

• kernel/GBEngine/kstd1.cc (modified) (10 diffs)

kernel/GBEngine/kstd1.cc

@@ -1205 +1205 @@
     else
       deleteHC(&(strat->L[i]), strat);
-   if (strat->L[i].IsNull())
+    if (strat->L[i].IsNull())
       deleteInL(strat->L,&strat->Ll,i,strat);
     else
@@ -1220 +1220 @@
 /*2
 * cuts in T above strat->kNoether and tries to cancel a unit
+* changes also S as S is a subset of T
 */
 void updateT(kStrategy strat)
@@ -1232 +1233 @@
     /*- tries to cancel a unit: -*/
     cancelunit(&p);
+    if (TEST_OPT_INTSTRATEGY) /* deleteHC and/or cancelunit may have changed p*/
+      p.pCleardenom();
     if (p.p != strat->T[i].p)
     {
@@ -1282 +1285 @@
       return;
 
-#ifndef HAVE_RINGS
-    strat->red = redFirst;
-    strat->use_buckets = kMoraUseBucket(strat);
-#else
+#ifdef HAVE_RINGS
     if ( (!rField_is_Ring(currRing)) || (rHasGlobalOrdering(currRing)))
+#endif
     {
       strat->red = redFirst;
       strat->use_buckets = kMoraUseBucket(strat);
     }
-#endif
     updateT(strat);
 
-#ifndef HAVE_RINGS
-    strat->posInT = posInT2;
-    reorderT(strat);
-#else
+#ifdef HAVE_RINGS
     if ( (!rField_is_Ring(currRing)) || (rHasGlobalOrdering(currRing)))
+#endif
     {
       strat->posInT = posInT2;
       reorderT(strat);
     }
-#endif
   }
   kTest_TS(strat);
@@ -1724 +1721 @@
     }
 
+    // the s-poly
     if (!strat->P.IsNull())
     {
@@ -1750 +1748 @@
     }
 
+    // the reduced s-poly
     if (! strat->P.IsNull())
     {
@@ -1756 +1755 @@
       if (TEST_OPT_PROT) PrintS("s");
       // normalization
-      if (!TEST_OPT_INTSTRATEGY)
+      if (TEST_OPT_INTSTRATEGY)
+        strat->P.pCleardenom();
+      else
         strat->P.pNorm();
       // tailreduction
@@ -1771 +1772 @@
       cancelunit(&strat->P);
       // for char 0, clear denominators
-      if (TEST_OPT_INTSTRATEGY)
+      if ((strat->P.p->next==NULL) /* i.e. cancelunit did something*/
+      && TEST_OPT_INTSTRATEGY)
         strat->P.pCleardenom();
 
@@ -1833 +1835 @@
       // clear strat->P
       if (strat->P.lcm!=NULL)
+      {
 #if defined(HAVE_RINGS)
         pLmDelete(strat->P.lcm);
@@ -1838 +1841 @@
         pLmFree(strat->P.lcm);
 #endif
-      strat->P.lcm=NULL;
+        strat->P.lcm=NULL;
+      }
 #ifdef KDEBUG
       // make sure kTest_TS does not complain about strat->P