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

Timestamp:

Aug 10, 2016, 12:41:43 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

d5d857d04cf9046b2cdd0a2ce1fae1415473c269

Parents:

e40da9f8133273ff0b3617f2e95f7bedfa0266bc41b9d0148bbf61fb89cd0f1b5c74a160774f24aa

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into SigDrop

Conflicts:
	kernel/GBEngine/kstd2.cc

File:

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

kernel/GBEngine/kutil.cc

@@ -2413 +2413 @@
 //#if 1
 #ifdef DEBUGF5
-  Print("P1  ");
+  PrintS("P1  ");
   pWrite(pHead(p));
-  Print("P2  ");
+  PrintS("P2  ");
   pWrite(pHead(strat->S[i]));
-  Print("M1  ");
+  PrintS("M1  ");
   pWrite(m1);
-  Print("M2  ");
+  PrintS("M2  ");
   pWrite(m2);
 #endif
@@ -2430 +2430 @@
 //#if 1
 #ifdef DEBUGF5
-  Print("----------------\n");
+  PrintS("----------------\n");
   pWrite(pSigMult);
   pWrite(sSigMult);
-  Print("----------------\n");
+  PrintS("----------------\n");
   Lp.checked  = 0;
 #endif
@@ -4479 +4479 @@
 #ifdef OLI_DEBUG
     Print("%d, (%d, %d), ind = (%d, %d)\n", cabsind, cexp[1], cexp[2], cind[1], cind[2]);
-    Print("zPoly : ");
+    PrintS("zPoly : ");
     wrp(zeroPoly);
-    Print("\n");
+    PrintLn();
 #endif
     enterOneZeroPairRing(zeroPoly, t_p, p, ecart, strat, atR);
@@ -4539 +4539 @@
 #ifdef OLI_DEBUG
     Print("%d, (%d, %d), ind = (%d, %d)\n", cabsind, cexp[1], cexp[2], cind[1], cind[2]);
-    Print("zPoly : ");
+    PrintS("zPoly : ");
     wrp(zeroPoly);
-    Print("\n");
+    PrintLn();
 #endif
     // Add to ideal
@@ -7074 +7074 @@
 //#if 1
 #ifdef DEBUGF5
-  Print("syzygy criterion checks:  ");
+  PrintS("syzygy criterion checks:  ");
   pWrite(sig);
 #endif
@@ -7114 +7114 @@
     return FALSE;
 #ifdef DEBUGF5
-  Print("--- syzygy criterion checks:  ");
+  PrintS("--- syzygy criterion checks:  ");
   pWrite(sig);
 #endif
@@ -7174 +7174 @@
 //#if 1
 #ifdef DEBUGF5
-    Print("checking with:  ");
+    PrintS("checking with:  ");
     pWrite(strat->sig[k]);
     pWrite(pHead(strat->S[k]));
@@ -7193 +7193 @@
   }
 #ifdef DEBUGF5
-  Print("ALL ELEMENTS OF S\n----------------------------------------\n");
+  PrintS("ALL ELEMENTS OF S\n----------------------------------------\n");
   for(int kk = 0; kk<strat->sl+1; kk++)
   {
     pWrite(pHead(strat->S[kk]));
   }
-  Print("------------------------------\n");
+  PrintS("------------------------------\n");
 #endif
   return FALSE;
@@ -9297 +9297 @@
     pWrite(strat->sig[k]);
   }
-  Print("--- LIST S END ---\n");
+  PrintS("--- LIST S END ---\n");
 #endif
 }