Changeset 58316de in git for kernel/GBEngine/kutil.cc

Timestamp:

Nov 24, 2018, 4:44:53 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

081f8d89bef1a35313405d0ccb8d5b71ff52516f

Parents:

b95a5fd690d6e706af819dfdf1070a990219bf41

Message:

Add debug output when a criterion is applied

File:

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

kernel/GBEngine/kutil.cc

@@ -12262 +12262 @@
 
 #ifdef HAVE_SHIFTBBA
+
+#ifdef KDEBUG
+#define CRITERION_DEBUG
+#endif
 /*2
 * put the pair (q,p)  into the set B, ecart=ecart(p), q is the shift of some s[i]
@@ -12267 +12271 @@
 void enterOnePairShift (poly q, poly p, int ecart, int isFromQ, kStrategy strat, int atR, int ecartq, int qisFromQ, int shiftcount, int ifromS)
 {
+#ifdef CRITERION_DEBUG
+  Print("Consider pair (%s, %s)\n", pString(q), pString(p));
+  poly lmq = pHead(q);
+  poly lmp = pHead(p);
+  Print("    %s\n", pString(lmq));
+  Print("    %s\n", pString(lmp));
+  pLmDelete(lmq);
+  pLmDelete(lmp);
+#endif
 
   /* Format: q and p are like strat->P.p, so lm in CR, tail in TR */
@@ -12304 +12317 @@
 
   /* apply the V criterion */
-  if (!pIsInV(Lp.lcm))
+  if (!pmIsInV(Lp.lcm))
   {
 #ifdef KDEBUG
@@ -12319 +12332 @@
     /* + counter for applying the V criterion */
     strat->cv++;
+#ifdef CRITERION_DEBUG
+    PrintS("--- V crit\n");
+#endif
     return;
   }
@@ -12343 +12359 @@
       strat->cp++;
       pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+      PrintS("--- prod crit\n");
+#endif
       return;
     }
@@ -12350 +12369 @@
     {
       pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+      PrintS("--- ecartq > ecart\n");
+#endif
       return;
       /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
@@ -12372 +12394 @@
           {
             pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+            Print("--- divided by B[%d]\n", j);
+#endif
             return;
           }
@@ -12381 +12406 @@
         {
           deleteInL(strat->B,&strat->Bl,j,strat);
+#ifdef CRITERION_DEBUG
+          Print("divides B[%d] -> delete B[%d]\n", j, j);
+#endif
           strat->c3++;
         }
@@ -12410 +12438 @@
           strat->cp++;
           pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+          PrintS("--- prod crit\n");
+#endif
           return;
       }
@@ -12415 +12446 @@
       {
         pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+        PrintS("--- ecartq > ecart\n");
+#endif
         return;
         /*the pair is (s[i],t[.]), discard it if the ecart is too big*/
@@ -12433 +12467 @@
           {
             pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+            Print("--- divided by B[%d]\n", j);
+#endif
             return;
           }
@@ -12441 +12478 @@
         {
           deleteInL(strat->B,&strat->Bl,j,strat);
+#ifdef CRITERION_DEBUG
+          Print("divides B[%d] -> delete B[%d]\n", j, j);
+#endif
           strat->c3++;
         }
@@ -12453 +12493 @@
     pNorm(p);
   if ((q==NULL) || (p==NULL))
+  {
+#ifdef CRITERION_DEBUG
+    PrintS("--- q == NULL || p == NULL\n");
+#endif
     return;
+  }
   if ((strat->fromQ!=NULL) && (isFromQ!=0) && (qfromQ!=0))
+  {
     Lp.p=NULL;
+#ifdef CRITERION_DEBUG
+    PrintS("--- pair from Q\n");
+#endif
+  }
   else
   {
@@ -12513 +12563 @@
     */
     if (Lp.lcm!=NULL) pLmFree(Lp.lcm);
+#ifdef CRITERION_DEBUG
+    PrintS("--- S-poly = 0\n");
+#endif
   }
   else
@@ -12549 +12602 @@
     l = strat->posInL(strat->B,strat->Bl,&Lp,strat);
     enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
+#ifdef CRITERION_DEBUG
+    PrintS("+++ Entered pair\n");
+#endif
   }
 }