Changeset 1c35568 in git

Timestamp:

Dec 18, 2009, 2:07:12 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

2b3caae5e93f036d36ceeb553934d1dcb89b3c60

Parents:

3a5edc375c8c9192d0f777ea79d63b5fde378a37

Message:

OPT_IDLIFT removed

git-svn-id: file:///usr/local/Singular/svn/trunk@12390 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• kstd2.cc (modified) (2 diffs)
• polys.cc (modified) (1 diff)

kernel/kstd2.cc

@@ -1193 +1193 @@
         enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
       // posInS only depends on the leading term
-      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
-      {
       strat->enterS(strat->P, pos, strat, strat->tl);
-      }
-      else
-      {
-      //  strat->P.Delete(); // syzComp test: it is in T
-      }
 #if 0
       int pl=pLength(strat->P.p);
@@ -1712 +1705 @@
       //      enterpairsShift(vw,strat->sl,strat->P.ecart,pos,strat, strat->tl,uptodeg,lV);
       // posInS only depends on the leading term
-      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
-      {
-        strat->enterS(strat->P, pos, strat, strat->tl);
-      }
-      else
-      {
-      //  strat->P.Delete(); // syzComp test: it is in T
-      }
+      strat->enterS(strat->P, pos, strat, strat->tl);
 
       if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);

kernel/polys.cc

@@ -717 +717 @@
 {
 
-  if (!TEST_OPT_IDLIFT)
-  {
-    if (pGetComp(p1) > 0 || pGetComp(p2) > 0)
-      return FALSE;
-  }
+  if (pGetComp(p1) > 0 || pGetComp(p2) > 0)
+    return FALSE;
   int i = pVariables;
   loop