Changeset b1bc24 in git for kernel/GBEngine/kutil.cc

Timestamp:

Dec 27, 2019, 10:50:09 AM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

0c27e478f70c2768cfbc17e1a349338d9b343828

Parents:

08b6c4fc9c411f9d7cb3e1c09916bac15398f2db

Message:

Fix chain crit for Letterplace

File:

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

kernel/GBEngine/kutil.cc

@@ -232 +232 @@
   return 0;
 }
+
+#ifdef HAVE_SHIFTBBA
+static inline int pLPDivComp(poly p, poly q) {
+  if ((currRing->pCompIndex < 0) || (__p_GetComp(p,currRing) == __p_GetComp(q,currRing)))
+  {
+    // maybe there is a more performant way to do this? This will get called quite often in bba.
+    if (_p_LPLmDivisibleByNoComp(p, q, currRing)) return 1;
+    if (_p_LPLmDivisibleByNoComp(q, p, currRing)) return -1;
+  }
+
+  return 0;
+}
+#endif
 
 
@@ -12889 +12902 @@
       {
         if (j < 0)  break;
-        compare=pDivComp(strat->B[j].lcm,Lp.lcm);
+        compare=pLPDivComp(strat->B[j].lcm,Lp.lcm);
         if ((compare==1)
         &&(sugarDivisibleBy(strat->B[j].ecart,Lp.ecart)))
@@ -12898 +12911 @@
             pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-            if (TEST_OPT_DEBUG) Print("--- divided by B[%d]\n", j);
+            if (TEST_OPT_DEBUG) {
+              Print("--- chain crit using B[%d].lcm=%s\n", j, pString(strat->B[j].lcm));
+            }
 #endif
             return;
@@ -12908 +12923 @@
         && sugarDivisibleBy(Lp.ecart,strat->B[j].ecart))
         {
+#ifdef CRITERION_DEBUG
+          if (TEST_OPT_DEBUG) {
+            Print("--- chain crit using pair to remove B[%d].lcm=%s\n", j, pString(strat->B[j].lcm));
+          }
+#endif
           deleteInL(strat->B,&strat->Bl,j,strat);
-#ifdef CRITERION_DEBUG
-          if (TEST_OPT_DEBUG) Print("divides B[%d] -> delete B[%d]\n", j, j);
-#endif
           strat->c3++;
         }
@@ -12963 +12980 @@
       for(j = strat->Bl;j>=0;j--)
       {
-        compare=pDivComp(strat->B[j].lcm,Lp.lcm);
+        compare=pLPDivComp(strat->B[j].lcm,Lp.lcm);
         if (compare==1)
         {
@@ -12971 +12988 @@
             pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-            if (TEST_OPT_DEBUG) Print("--- divided by B[%d]\n", j);
+            if (TEST_OPT_DEBUG) {
+              Print("--- chain crit using B[%d].lcm=%s\n", j, pString(strat->B[j].lcm));
+            }
 #endif
             return;
@@ -12980 +12999 @@
         if (compare ==-1)
         {
+#ifdef CRITERION_DEBUG
+          if (TEST_OPT_DEBUG) {
+            Print("--- chain crit using pair to remove B[%d].lcm=%s\n", j, pString(strat->B[j].lcm));
+          }
+#endif
           deleteInL(strat->B,&strat->Bl,j,strat);
-#ifdef CRITERION_DEBUG
-          if (TEST_OPT_DEBUG) Print("divides B[%d] -> delete B[%d]\n", j, j);
-#endif
           strat->c3++;
         }
@@ -13006 +13027 @@
     Lp.p=NULL;
 #ifdef CRITERION_DEBUG
-    if (TEST_OPT_DEBUG) PrintS("--- pair from Q\n");
+    if (TEST_OPT_DEBUG) PrintS("--- pair is from Q\n");
 #endif
   }