Changeset 512a2b in git for Singular/pDebug.cc

Timestamp:

Sep 18, 2000, 11:19:39 AM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d1655e92ca71fb37d1b57af88efdff5b65b8988b

Parents:

f3398d316400fe1ee1677fc397cacb80566ac664

Message:

p_polys.h


git-svn-id: file:///usr/local/Singular/svn/trunk@4606 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/pDebug.cc (modified) (8 diffs)

Singular/pDebug.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pDebug.cc,v 1.3 2000-09-14 14:20:44 obachman Exp $
+ *  Version: $Id: pDebug.cc,v 1.4 2000-09-18 09:19:23 obachman Exp $
  *******************************************************************/
 
@@ -18 +18 @@
 #ifdef PDEBUG
 
-#include "polys.h"
+#include "p_polys.h"
 #include "febase.h"
 #include "omalloc.h"
 #include "ring.h"
+#include "numbers.h"
 
 
@@ -68 +69 @@
     if (custom != NULL)
     {
-      pPolyAssumeReturn(custom == r);
+      pPolyAssumeReturnMsg(custom == r || rEqual((ring) custom, r, FALSE), 
+                           "monomial not from specified ring");
       return TRUE;
     }
@@ -101 +103 @@
 static int pDivisibleBy_FALSE = 1;
 static int pDivisibleBy_ShortFalse = 1;
-BOOLEAN pDebugShortDivisibleBy(poly p1, unsigned long sev_1, ring r_1,
+BOOLEAN pDebugLmShortDivisibleBy(poly p1, unsigned long sev_1, ring r_1,
                                poly p2, unsigned long not_sev_2, ring r_2)
 {
@@ -108 +110 @@
 
   pDivisibleBy_number++;
-  BOOLEAN ret = _p_DivisibleBy1(p1, r_1, p2, r_2);
+  BOOLEAN ret = p_LmDivisibleBy(p1, r_1, p2, r_2);
   if (! ret) pDivisibleBy_FALSE++;
   if (sev_1 & not_sev_2)
@@ -205 +207 @@
 
     // special check for ringorder_s/S
-    if (currRing->order[1] == ringorder_S)
+    if (r->order[1] == ringorder_S)
     {
       long c1, cc1, ccc1, ec1;
-      sro_ord* o = &(currRing->typ[1]);
-
-      c1 = pGetComp(p);
+      sro_ord* o = &(r->typ[1]);
+
+      c1 = p_GetComp(p, r);
       cc1 = o->data.syzcomp.Components[c1];
       ccc1 = o->data.syzcomp.ShiftedComponents[cc1];
       pPolyAssumeReturnMsg(c1 == 0 || cc1 != 0, "Component <-> TrueComponent zero mismatch");
       pPolyAssumeReturnMsg(c1 == 0 || ccc1 != 0,"Component <-> ShiftedComponent zero mismatch");
-      ec1 = p->exp[currRing->typ[1].data.syzcomp.place];
+      ec1 = p->exp[r->typ[1].data.syzcomp.place];
       pPolyAssumeReturnMsg(ec1 == ccc1, "Shifted comp out of sync. should %d, is %d");
     }
@@ -224 +226 @@
       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_Free(p_should_equal, r);
+      p_LmFree(p_should_equal, r);
     }
     
@@ -280 +282 @@
     poly pnext = pNext(lm);
     pNext(lm) = tail;
-    BOOLEAN cmp = p_LmCmp(lm, tail);
+    BOOLEAN cmp = p_LmCmp(lm, tail, lmRing);
     if (cmp != 1)
       dPolyReportError(lm, lmRing, "wrong order: lm <= Lm(tail)");