Changeset 17bc740 in git for kernel/GBEngine/kutil.cc

Timestamp:

Feb 5, 2021, 6:59:30 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ff4cbacc83944accd7caea5f872dc17187736644

Parents:

66805e9596322cdaf1ea898965d3b22dfc939b1d

Message:

fix: liftstd

File:

• kernel/GBEngine/kutil.cc (modified) (8 diffs)

kernel/GBEngine/kutil.cc

@@ -2000 +2000 @@
   if (strat->sugarCrit && ALLOW_PROD_CRIT(strat))
   {
+    if (strat->fromT && (strat->ecartS[i]>ecart))
+    {
+      pLmFree(Lp.lcm);
+      return;
+      /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
+    }
     if((!((strat->ecartS[i]>0)&&(ecart>0)))
     && pHasNotCF(p,strat->S[i]))
@@ -2021 +2027 @@
       return;
     }
-    else
-      Lp.ecart = si_max(ecart,strat->ecartS[i]);
-    if (strat->fromT && (strat->ecartS[i]>ecart))
-    {
-      pLmFree(Lp.lcm);
-      return;
-      /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
-    }
+    Lp.ecart = si_max(ecart,strat->ecartS[i]);
     /*
     *the set B collects the pairs of type (S[j],p)
@@ -2067 +2066 @@
     if (ALLOW_PROD_CRIT(strat))
     {
+      if (strat->fromT && (strat->ecartS[i]>ecart))
+      {
+        pLmFree(Lp.lcm);
+        return;
+        /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
+      }
       // if currRing->nc_type!=quasi (or skew)
       // TODO: enable productCrit for super commutative algebras...
@@ -2088 +2093 @@
           return;
       }
-      if (strat->fromT && (strat->ecartS[i]>ecart))
-      {
-        pLmFree(Lp.lcm);
-        return;
-        /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
-      }
       /*
       *the set B collects the pairs of type (S[j],p)
@@ -2236 +2235 @@
 }
 
-/// p_HasNotCF for the IDLIFT case: ignore component
-static BOOLEAN p_HasNotCF_Lift(poly p1, poly p2, const ring r)
+/// p_HasNotCF for the IDLIFT case and syzComp==1: ignore component
+static inline BOOLEAN p_HasNotCF_Lift(poly p1, poly p2, const ring r)
 {
   int i = rVar(r);
@@ -2252 +2251 @@
 /*2
 * put the pair (s[i],p)  into the set B, ecart=ecart(p) for idLift(I,T)
+*  (in the special case: idLift for ideals, i.e. strat->syzComp==1)
+*  (prod.crit applies)
 */
 
@@ -2259 +2260 @@
   assume(!rIsPluralRing(currRing));
   assume(i<=strat->sl);
+  assume(strat->syzComp==1);
 
   if ((strat->S[i]==NULL) || (p==NULL))
@@ -10013 +10015 @@
 #endif
   if (TEST_OPT_IDLIFT
+  && (strat->syzComp==1)
   && (!rIsPluralRing(currRing)))
     strat->enterOnePair=enterOnePairLift;