Changeset 6f203b in git for kernel

Timestamp:

May 17, 2016, 5:46:47 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2b0c08e1798ffdc4cdb8493eab751ca7cb11f20e

Parents:

e6f1e67739dcb8bc40ce2fcd97b4b37cfe8f0302

Message:

chg: clean strat-P before calling strat->s_poly (in bba)

File:

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

kernel/GBEngine/kstd2.cc

@@ -1640 +1640 @@
 #endif
       }
+      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+//      Print("[%d]",hilbeledeg);
+      if (strat->P.lcm!=NULL)
+      {
+        if (rField_is_Ring(currRing)) pLmDelete(strat->P.lcm);
+        else                          pLmFree(strat->P.lcm);
+        strat->P.lcm=NULL;
+      }
       if (strat->s_poly!=NULL)
       {
+        // the only valid entries are: strat->P.p,
+        // strat->tailRing (read-only, keep it)
+        // (and P->p1, P->p2 (read-only, must set to NULL if P.p is changed)
         if (strat->s_poly(strat))
         {
           // we are called AFTER enterS, i.e. if we change P
-          // we have it also to S/T
+          // we have to add it also to S/T
           // and add pairs
           int pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
@@ -1655 +1666 @@
           strat->enterS(strat->P, pos, strat, strat->tl);
         }
-      }
-
-      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
-//      Print("[%d]",hilbeledeg);
-      if (strat->P.lcm!=NULL)
-      {
-        if (rField_is_Ring(currRing)) pLmDelete(strat->P.lcm);
-        else                          pLmFree(strat->P.lcm);
-        strat->P.lcm=NULL;
       }
     }