Changeset 4a45a4e in git

Timestamp:

Jun 15, 2015, 12:16:06 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

4470e259ee2a2b265d8bdc47b48ea3e4619298b5

Parents:

0269e193f4830d56d57f6a85911be55807f13b15

Message:

removed p_DebugPrint (->p_wrp)

Location:

libpolys/polys

Files:

• monomials/p_polys.cc (modified) (7 diffs)
• monomials/ring.cc (modified) (3 diffs)
• monomials/ring.h (modified) (1 diff)
• simpleideals.cc (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -351 +351 @@
 #ifndef SING_NDEBUG
 #if MYTEST
-          Print("p_Setm_General: ro_isTemp ord: pos: %d, p: ", pos);  p_DebugPrint(p, r, r, 1);
+          Print("p_Setm_General: ro_isTemp ord: pos: %d, p: ", pos);  p_wrp(p, r);
 #endif
 #endif
@@ -388 +388 @@
 #if MYTEST
 //          if( p->exp[o->data.isTemp.start] > 0 )
-            PrintS("after Values: "); p_DebugPrint(p, r, r, 1);
+            PrintS("after Values: "); p_wrp(p, r);
 #endif
 #endif
@@ -399 +399 @@
 #ifndef SING_NDEBUG
 #if MYTEST
-          Print("p_Setm_General: ro_is ord: pos: %d, p: ", pos);  p_DebugPrint(p, r, r, 1);
+          Print("p_Setm_General: ro_is ord: pos: %d, p: ", pos);  p_wrp(p, r);
 #endif
 #endif
@@ -417 +417 @@
 #ifndef SING_NDEBUG
 #if MYTEST
-            Print("p_Setm_General: ro_is : in rSetm: pos: %d, c: %d >  limit: %d\n", c, pos, limit); // p_DebugPrint(p, r, r, 1);
+            Print("p_Setm_General: ro_is : in rSetm: pos: %d, c: %d >  limit: %d\n", c, pos, limit);
             PrintS("preComputed Values: ");
-            p_DebugPrint(p, r, r, 1);
+            p_wrp(p, r);
 #endif
 #endif
@@ -447 +447 @@
 #if MYTEST
             Print("Respective F[c - %d: %d] pp: ", limit, c);
-            p_DebugPrint(pp, r, r, 1);
+            p_wrp(pp, r);
 #endif
 #endif
@@ -492 +492 @@
             // TODO: how to check this for computed values???
 #if MYTEST
-            PrintS("Computed Values: "); p_DebugPrint(p, r, r, 1);
+            PrintS("Computed Values: "); p_wrp(p, r);
 #endif
 #endif
@@ -511 +511 @@
 #if MYTEST
             Print("ELSE p_Setm_General: ro_is :: c: %d <= limit: %d, vo: %d, exp: %d\n", c, limit, vo, p->exp[vo]);
-            p_DebugPrint(p, r, r, 1);
+            p_wrp(p, r);
 #endif
 #endif

libpolys/polys/monomials/ring.cc

@@ -4246 +4246 @@
 
 
-#ifndef SING_NDEBUG
-/// debug-print at most nTerms (2 by default) terms from poly/vector p,
-/// assuming that lt(p) lives in lmRing and tail(p) lives in tailRing.
-void p_DebugPrint(const poly p, const ring lmRing, const ring tailRing, const int nTerms)
-{
-  assume( nTerms >= 0 );
-  if( p != NULL )
-  {
-    assume( p != NULL );
-
-    p_Write(p, lmRing, tailRing);
-
-    if( (p != NULL) && (nTerms > 0) )
-    {
-      assume( p != NULL );
-      assume( nTerms > 0 );
-
-      // debug pring leading term
-      m_DebugPrint(p, lmRing);
-
-      poly q = pNext(p); // q = tail(p)
-
-      // debug pring tail (at most nTerms-1 terms from it)
-      for(int j = nTerms - 1; (q !=NULL) && (j > 0); pIter(q), --j)
-        m_DebugPrint(q, tailRing);
-
-      if (q != NULL)
-        PrintS("...\n");
-    }
-  }
-  else
-    PrintS("0\n");
-}
-#endif
-
-
 //    F = system("ISUpdateComponents", F, V, MIN );
 //    // replace gen(i) -> gen(MIN + V[i-MIN]) for all i > MIN in all terms from F!
@@ -4296 +4260 @@
 #ifdef PDEBUG
     Print("F[%d]:", j);
-    p_DebugPrint(F->m[j], r, r, 0);
+    p_wrp(F->m[j], r);
 #endif
 
@@ -4315 +4279 @@
     Print("new F[%d]:", j);
     p_Test(F->m[j], r);
-    p_DebugPrint(F->m[j], r, r, 0);
-#endif
-  }
-
-}
-
-
-
+    p_wrp(F->m[j], r);
+#endif
+  }
+}
 
 /*2

libpolys/polys/monomials/ring.h

@@ -801 +801 @@
 #endif
 
-#ifndef SING_NDEBUG
-/// debug-print at most nTerms (2 by default) terms from poly/vector p,
-/// assuming that lt(p) lives in lmRing and tail(p) lives in tailRing.
-void p_DebugPrint(const poly p, const ring lmRing, const ring tailRing, const int nTerms = 2);
-#endif
-
 int64 * rGetWeightVec(ring r);
 void rSetWeightVec(ring r, int64 *wv);

libpolys/polys/simpleideals.cc

@@ -73 +73 @@
     for (int i = 0; i <= j; i++)
     {
-      Print("generator %d: ",i); p_DebugPrint(id->m[i], lmRing, tailRing, debugPrint);
+      Print("generator %d: ",i); p_wrp(id->m[i], lmRing, tailRing);
     }
   }