Changeset f7d39b in git for libpolys/polys

Timestamp:

Sep 15, 2014, 9:12:38 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

4ec0f01d431893a4c0997d2bdfab87cb8d37e03e

Parents:

a4771e1b7535535946d3bd424ce5c97bd0866119

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-15 21:12:38+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-09-23 20:08:14+02:00

Message:

Added more general id_TestTail + related cleanup for id_?(Test|Print)

Location:

libpolys/polys

Files:

• monomials/p_polys.cc (modified) (5 diffs)
• simpleideals.cc (modified) (2 diffs)
• simpleideals.h (modified) (2 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -775 +775 @@
 {
   assume(p!=NULL);
-#ifdef PDEBUG
-  _p_Test(p,r,PDEBUG);
-#endif
+  p_Test(p,r);
   p_CheckPolyRing(p, r);
   long o;
@@ -802 +800 @@
       pp = p;
     }
-#ifdef PDEBUG
-    _p_Test(pp,r,PDEBUG);
-#endif
+    p_Test(pp,r);
     o = r->pFDeg(pp, r);
   }
@@ -1446 +1442 @@
     return NULL;
   }
-  #ifdef PDEBUG
-  _p_Test(p,r,PDEBUG);
-  #endif
+  p_Test(p,r);
   ok=!errorreported;
   return p;
@@ -2040 +2034 @@
     p_MonPower(p,exp,r);
     p_MonPower(tail,exp,r);
-#ifdef PDEBUG
     p_Test(p,r);
-#endif
     return p;
   }
@@ -2089 +2081 @@
 //     pIter(tail);
 // }
-#ifdef PDEBUG
   p_Test(res,r);
-#endif
   return res;
 }

libpolys/polys/simpleideals.cc

@@ -417 +417 @@
 
 #ifdef PDEBUG
-void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r)
+void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r, const ring tailRing)
 {
   int i;
@@ -426 +426 @@
     omCheckAddrSize(h1,sizeof(*h1));
     omdebugAddrSize(h1->m,h1->ncols*h1->nrows*sizeof(poly));
+     
     /* to be able to test matrices: */
     for (i=(h1->ncols*h1->nrows)-1; i>=0; i--)
-      _p_Test(h1->m[i], r, level);
-    int new_rk=id_RankFreeModule(h1,r);
+      _pp_Test(h1->m[i], r, tailRing, level);
+     
+    int new_rk=id_RankFreeModule(h1, r, tailRing);
     if(new_rk > h1->rank)
     {

libpolys/polys/simpleideals.h

@@ -63 +63 @@
 
 #ifdef PDEBUG
-void id_DBTest(ideal h1, int level, const char *f,const int l, const ring r);
-#define id_Test(A, r) id_DBTest(A, PDEBUG, __FILE__,__LINE__, r)
-// #define id_Print(id, r) id_Show(id, r)
+void id_DBTest(ideal h1, int level, const char *f,const int l, const ring lR, const ring tR );
+#define id_TestTail(A, lR, tR) id_DBTest(A, PDEBUG, __FILE__,__LINE__, lR, tR)
+#define id_Test(A, lR) id_DBTest(A, PDEBUG, __FILE__,__LINE__, lR, lR)
 #else
-#define id_Test(A, r)  do {} while (0)
-// #define id_Print(A, r) do {} while (0)
+#define id_TestTail(A, lR, tR)  do {} while (0)
+#define id_Test(A, lR) do {} while (0)
 #endif
 
@@ -131 +131 @@
 #ifdef PDEBUG
 void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint = 0);
+#define id_Print(id, lR, tR) idShow(id, lR, tR)
+#else
+#define id_Print(A, lR, tR) do {} while (0)
 #endif
+