Changeset 0ffdec in git for libpolys/polys/pDebug.cc

Timestamp:

Apr 19, 2011, 11:39:03 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

f27003fd89ac86ed0bd7cc93a1342d129926c00c

Parents:

4f684a7f137cff04239a5a3fa6eb3dafd2cc5084

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-19 11:39:03+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:17+01:00

Message:

fix pDebug

File:

• libpolys/polys/pDebug.cc (modified) (12 diffs)

libpolys/polys/pDebug.cc

@@ -17 +17 @@
 
 #include "config.h"
+#include <misc/auxiliary.h>
 #ifdef PDEBUG
 
@@ -24 +25 @@
 
 //#include <polys/monomials/p_polys.h>
-#include <output.h>
+//#include <output.h>
 #include <omalloc/omalloc.h>
 #include <polys/monomials/ring.h>
+#include <polys/monomials/p_polys.h>
 #include <coeffs/coeffs.h>
 
@@ -49 +51 @@
   if (p != NULL)
   {
-    if (r == currRing)
-    {
-      fprintf(stderr, " occured for poly: ");
-      p_wrp(p, r);
-      omPrintAddrInfo(stderr, p, " ");
-    }
-    else
-    {
-      omPrintAddrInfo(stderr, p, " occured for poly: ");
-    }
+    fprintf(stderr, " occured for poly: ");
+    p_wrp(p, r);
+    omPrintAddrInfo(stderr, p, " ");
   }
   dErrorBreak();
@@ -90 +85 @@
     #endif
     {
-      pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==r->PolyBin->sizeW,p,r);
+      _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==r->PolyBin->sizeW,p,r);
       return TRUE;
     }
@@ -143 +138 @@
   while (i);
 #ifdef HAVE_RINGS
-  return nDivBy(pGetCoeff(b), pGetCoeff(a));
+  return n_DivBy(pGetCoeff(b), pGetCoeff(a), r->cf);
 #else
   return TRUE;
@@ -213 +208 @@
   #ifndef OM_NDEBUG
   // check addr with level+1 so as to check bin/page of addr
-  pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, level+1)
+  _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, level+1)
                         == omError_NoError, "memory error",p,r);
   #endif
@@ -233 +228 @@
     #ifndef OM_NDEBUG
     // omAddr check
-    pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, 1)
+    _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (r->PolyBin->sizeW)*SIZEOF_LONG, 1)
                      == omError_NoError, "memory error",p,r);
     #endif
     // number/coef check
-    pPolyAssumeReturnMsg(p->coef != NULL || (n_GetChar(r) >= 2), "NULL coef",p,r);
+    _pPolyAssumeReturnMsg(p->coef != NULL || (n_GetChar(r->cf) >= 2), "NULL coef",p,r);
     #ifdef LDEBUG
-    r->cf->nDBTest(p->coef,__FILE__,__LINE__);
+    r->cf->cfDBTest(p->coef,__FILE__,__LINE__,r->cf);
     #endif
-    pPolyAssumeReturnMsg(!n_IsZero(p->coef, r), "Zero coef",p,r);
+    _pPolyAssumeReturnMsg(!n_IsZero(p->coef, r->cf), "Zero coef",p,r);
 
     // check for valid comp
-    pPolyAssumeReturnMsg(p_GetComp(p, r) >= 0 && (p_GetComp(p, r)<65000), "component out of range ?",p,r);
+    _pPolyAssumeReturnMsg(p_GetComp(p, r) >= 0 && (p_GetComp(p, r)<65000), "component out of range ?",p,r);
     // check for mix poly/vec representation
-    pPolyAssumeReturnMsg(ismod == (p_GetComp(p, r) != 0), "mixed poly/vector",p,r);
+    _pPolyAssumeReturnMsg(ismod == (p_GetComp(p, r) != 0), "mixed poly/vector",p,r);
 
     // special check for ringorder_s/S
@@ -261 +256 @@
       }
       else { cc1=0; ccc1=0; }
-      pPolyAssumeReturnMsg(c1 == 0 || cc1 != 0, "Component <-> TrueComponent zero mismatch",p,r);
-      pPolyAssumeReturnMsg(c1 == 0 || ccc1 != 0,"Component <-> ShiftedComponent zero mismatch",p,r);
+      _pPolyAssumeReturnMsg(c1 == 0 || cc1 != 0, "Component <-> TrueComponent zero mismatch",p,r);
+      _pPolyAssumeReturnMsg(c1 == 0 || ccc1 != 0,"Component <-> ShiftedComponent zero mismatch",p,r);
       ec1 = p->exp[o->data.syzcomp.place];
       //pPolyAssumeReturnMsg(ec1 == ccc1, "Shifted comp out of sync. should %d, is %d");
@@ -276 +271 @@
     {
       poly p_should_equal = p_DebugInit(p, r, r);
-      pPolyAssumeReturnMsg(p_ExpVectorEqual(p, p_should_equal, r), "p_Setm field(s) out of sync",p,r);
+      _pPolyAssumeReturnMsg(p_ExpVectorEqual(p, p_should_equal, r), "p_Setm field(s) out of sync",p,r);
       p_LmFree(p_should_equal, r);
     }
@@ -286 +281 @@
       if (cmp == 0)
       {
-        pPolyAssumeReturnMsg(0, "monoms p and p->next are equal", p_prev, r);
+        _pPolyAssumeReturnMsg(0, "monoms p and p->next are equal", p_prev, r);
       }
       else
-        pPolyAssumeReturnMsg(p_LmCmp(p_prev, p, r) == 1, "wrong order", p_prev, r);
+        _pPolyAssumeReturnMsg(p_LmCmp(p_prev, p, r) == 1, "wrong order", p_prev, r);
 
       // check that compare worked sensibly
@@ -299 +294 @@
           if (p_GetExp(p_prev, i, r) != p_GetExp(p, i, r)) break;
         }
-        pPolyAssumeReturnMsg(i > 0, "Exponents equal but compare different", p_prev, r);
+        _pPolyAssumeReturnMsg(i > 0, "Exponents equal but compare different", p_prev, r);
       }
     }
@@ -353 +348 @@
                                poly p2, unsigned long not_sev_2, ring r_2)
 {
-  pPolyAssume(p_GetShortExpVector(p1, r_1) == sev_1, p1, r_1);
-  pPolyAssume(p_GetShortExpVector(p2, r_2) == ~ not_sev_2, p2, r_2);
+  _pPolyAssume(p_GetShortExpVector(p1, r_1) == sev_1, p1, r_1);
+  _pPolyAssume(p_GetShortExpVector(p2, r_2) == ~ not_sev_2, p2, r_2);
 
   pDivisibleBy_number++;