Changeset 0d8474c in git for kernel

Timestamp:

Dec 4, 2018, 4:25:34 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

308e89cd3835b81bfc0e9f0dbd5450159e27cad4

Parents:

f4245d4d5a8b5328234382a5c5cf906631971ade

Message:

Better debugging for pairs

File:

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

kernel/GBEngine/kutil.cc

@@ -12263 +12263 @@
 {
 #ifdef CRITERION_DEBUG
-  Print("Consider pair (%s, %s)\n", pString(q), pString(p));
-  // also write the LMs in separate lines:
-  poly lmq = pHead(q);
-  poly lmp = pHead(p);
-  pSetCoeff(lmq, n_Init(1, currRing->cf));
-  pSetCoeff(lmp, n_Init(1, currRing->cf));
-  Print("    %s\n", pString(lmq));
-  Print("    %s\n", pString(lmp));
-  pLmDelete(lmq);
-  pLmDelete(lmp);
+  if (TEST_OPT_DEBUG)
+  {
+    PrintS("Consider pair ("); wrp(q); PrintS(", "); wrp(p); PrintS(")"); PrintLn();
+    // also write the LMs in separate lines:
+    poly lmq = pHead(q);
+    poly lmp = pHead(p);
+    pSetCoeff(lmq, n_Init(1, currRing->cf));
+    pSetCoeff(lmp, n_Init(1, currRing->cf));
+    Print("    %s\n", pString(lmq));
+    Print("    %s\n", pString(lmp));
+    pLmDelete(lmq);
+    pLmDelete(lmp);
+  }
 #endif
 
@@ -12283 +12286 @@
   assume(p_CheckIsFromRing(pNext(p),strat->tailRing));
 
-#ifdef KDEBUG
-//    if (TEST_OPT_DEBUG)
-//    {
-//       PrintS("enterOnePairShift(q,p) invoked with q = ");
-//       wrp(q); //      wrp(pHead(q));
-//       PrintS(", p = ");
-//       wrp(p); //wrp(pHead(p));
-//       PrintLn();
-//    }
-#endif
-
   /* poly q stays for s[i], ecartq = ecart(q), qisFromQ = applies to q */
 
@@ -12310 +12302 @@
   Lp.lcm = p_Lcm(p,q, currRing); // q is what was strat->S[i], so a poly in LM/TR presentation
 
-  /* apply the V criterion */
+  /* the V criterion */
   if (!pmIsInV(Lp.lcm))
   {
-#ifdef KDEBUG
-    if (TEST_OPT_DEBUG)
-    {
-      PrintS("V crit applied to q = ");
-      wrp(q); //      wrp(pHead(q));
-      PrintS(", p = ");
-      wrp(p); //wrp(pHead(p));
-      PrintLn();
-    }
-#endif
+    strat->cv++; // counter for applying the V criterion
     pLmFree(Lp.lcm);
-    /* + counter for applying the V criterion */
-    strat->cv++;
 #ifdef CRITERION_DEBUG
-    PrintS("--- V crit\n");
+    if (TEST_OPT_DEBUG) PrintS("--- V crit\n");
 #endif
     return;
@@ -12354 +12335 @@
       pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-      PrintS("--- prod crit\n");
+      if (TEST_OPT_DEBUG) PrintS("--- prod crit\n");
 #endif
       return;
@@ -12364 +12345 @@
       pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-      PrintS("--- ecartq > ecart\n");
+      if (TEST_OPT_DEBUG) PrintS("--- ecartq > ecart\n");
 #endif
       return;
@@ -12389 +12370 @@
             pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-            Print("--- divided by B[%d]\n", j);
+            if (TEST_OPT_DEBUG) Print("--- divided by B[%d]\n", j);
 #endif
             return;
@@ -12401 +12382 @@
           deleteInL(strat->B,&strat->Bl,j,strat);
 #ifdef CRITERION_DEBUG
-          Print("divides B[%d] -> delete B[%d]\n", j, j);
+          if (TEST_OPT_DEBUG) Print("divides B[%d] -> delete B[%d]\n", j, j);
 #endif
           strat->c3++;
@@ -12433 +12414 @@
           pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-          PrintS("--- prod crit\n");
+          if (TEST_OPT_DEBUG) PrintS("--- prod crit\n");
 #endif
           return;
@@ -12441 +12422 @@
         pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-        PrintS("--- ecartq > ecart\n");
+        if (TEST_OPT_DEBUG) PrintS("--- ecartq > ecart\n");
 #endif
         return;
@@ -12462 +12443 @@
             pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-            Print("--- divided by B[%d]\n", j);
+            if (TEST_OPT_DEBUG) Print("--- divided by B[%d]\n", j);
 #endif
             return;
@@ -12473 +12454 @@
           deleteInL(strat->B,&strat->Bl,j,strat);
 #ifdef CRITERION_DEBUG
-          Print("divides B[%d] -> delete B[%d]\n", j, j);
+          if (TEST_OPT_DEBUG) Print("divides B[%d] -> delete B[%d]\n", j, j);
 #endif
           strat->c3++;
@@ -12489 +12470 @@
   {
 #ifdef CRITERION_DEBUG
-    PrintS("--- q == NULL || p == NULL\n");
+    if (TEST_OPT_DEBUG) PrintS("--- q == NULL || p == NULL\n");
 #endif
     return;
@@ -12497 +12478 @@
     Lp.p=NULL;
 #ifdef CRITERION_DEBUG
-    PrintS("--- pair from Q\n");
+    if (TEST_OPT_DEBUG) PrintS("--- pair from Q\n");
 #endif
   }
@@ -12558 +12539 @@
     if (Lp.lcm!=NULL) pLmFree(Lp.lcm);
 #ifdef CRITERION_DEBUG
-    PrintS("--- S-poly = 0\n");
+    if (TEST_OPT_DEBUG) PrintS("--- S-poly = 0\n");
 #endif
   }
@@ -12597 +12578 @@
     enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
 #ifdef CRITERION_DEBUG
-    PrintS("+++ Entered pair\n");
+    if (TEST_OPT_DEBUG) PrintS("+++ Entered pair\n");
 #endif
   }