Changeset 5948a8 in git for libpolys/polys/monomials

Timestamp:

Mar 30, 2011, 4:50:13 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

bb6c8a5b9ffdd315338acd9b7d6eb2fd40522955

Parents:

0ceb74fb301333567c3206509584432bc130b144

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-30 16:50:13+02:00

git-committer:

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

Message:

FIX: moving stuff around in order to fix inlines/declarations problems

Location:

libpolys/polys/monomials

Files:

• monomials.h (modified) (1 diff)
• p_polys.h (modified) (6 diffs)

libpolys/polys/monomials/monomials.h

@@ -27 +27 @@
   unsigned long exp[1];     // make sure that exp is aligned
 };
-
-
-/***************************************************************
- *
- * Macros for access/iteration
- *
- ***************************************************************/
-// #define pNext(p)           ((p)->next)
-// #define pIter(p)           ((p) = (p)->next)
-
-// coeff
-//#define pGetCoeff(p)       ((p)->coef)
-//#define pSetCoeff0(p,n)    (p)->coef=n
-
-#define __p_GetComp(p, r)   (p)->exp[r->pCompIndex]
-#define p_GetComp(p, r)    ((long) (r->pCompIndex >= 0 ? __p_GetComp(p, r) : 0))
 
 /***************************************************************

libpolys/polys/monomials/p_polys.h

@@ -37 +37 @@
 #define p_SetCoeff0(p,n,r)  pSetCoeff0(p,n)
 
+#define __p_GetComp(p, r)   (p)->exp[r->pCompIndex]
+#define p_GetComp(p, r)    ((long) (r->pCompIndex >= 0 ? __p_GetComp(p, r) : 0))
+
 /***************************************************************
  *
@@ -115 +118 @@
 
 poly      p_Power(poly p, int i, const ring r);
+
+
+/***************************************************************
+ *
+ * PDEBUG stuff
+ *
+ ***************************************************************/
+#ifdef PDEBUG
+// Returns TRUE if m is monom of p, FALSE otherwise
+BOOLEAN pIsMonomOf(poly p, poly m);
+// Returns TRUE if p and q have common monoms
+BOOLEAN pHaveCommonMonoms(poly p, poly q);
+
+// p_Check* routines return TRUE if everything is ok,
+// else, they report error message and return false
+
+// check if Lm(p) is from ring r
+BOOLEAN p_LmCheckIsFromRing(poly p, ring r);
+// check if Lm(p) != NULL, r != NULL and initialized && Lm(p) is from r
+BOOLEAN p_LmCheckPolyRing(poly p, ring r);
+// check if all monoms of p are from ring r
+BOOLEAN p_CheckIsFromRing(poly p, ring r);
+// check r != NULL and initialized && all monoms of p are from r
+BOOLEAN p_CheckPolyRing(poly p, ring r);
+// check if r != NULL and initialized
+BOOLEAN p_CheckRing(ring r);
+// only do check if cond
+
+
+#define pIfThen(cond, check) do {if (cond) {check;}} while (0)
+
+BOOLEAN _p_Test(poly p, ring r, int level);
+BOOLEAN _p_LmTest(poly p, ring r, int level);
+BOOLEAN _pp_Test(poly p, ring lmRing, ring tailRing, int level);
+
+#define p_Test(p,r)     _p_Test(p, r, PDEBUG)
+#define p_LmTest(p,r)   _p_LmTest(p, r, PDEBUG)
+#define pp_Test(p, lmRing, tailRing)    _pp_Test(p, lmRing, tailRing, PDEBUG)
+
+#else // ! PDEBUG
+
+#define pIsMonomOf(p, q)        (TRUE)
+#define pHaveCommonMonoms(p, q) (TRUE)
+#define p_LmCheckIsFromRing(p,r)  ((void)0)
+#define p_LmCheckPolyRing(p,r)    ((void)0)
+#define p_CheckIsFromRing(p,r)  ((void)0)
+#define p_CheckPolyRing(p,r)    ((void)0)
+#define p_CheckRing(r)          ((void)0)
+#define P_CheckIf(cond, check)  ((void)0)
+
+#define p_Test(p,r)     (1)
+#define p_LmTest(p,r)   (1)
+#define pp_Test(p, lmRing, tailRing) (1)
+
+#endif
+
 /***************************************************************
  *
@@ -324 +383 @@
 
 long p_Deg(poly a, const ring r);
-/***************************************************************
- *
- * PDEBUG stuff
- *
- ***************************************************************/
-#ifdef PDEBUG
-// Returns TRUE if m is monom of p, FALSE otherwise
-BOOLEAN pIsMonomOf(poly p, poly m);
-// Returns TRUE if p and q have common monoms
-BOOLEAN pHaveCommonMonoms(poly p, poly q);
-
-// p_Check* routines return TRUE if everything is ok,
-// else, they report error message and return false
-
-// check if Lm(p) is from ring r
-BOOLEAN p_LmCheckIsFromRing(poly p, ring r);
-// check if Lm(p) != NULL, r != NULL and initialized && Lm(p) is from r
-BOOLEAN p_LmCheckPolyRing(poly p, ring r);
-// check if all monoms of p are from ring r
-BOOLEAN p_CheckIsFromRing(poly p, ring r);
-// check r != NULL and initialized && all monoms of p are from r
-BOOLEAN p_CheckPolyRing(poly p, ring r);
-// check if r != NULL and initialized
-BOOLEAN p_CheckRing(ring r);
-// only do check if cond
-
-
-#define pIfThen(cond, check) do {if (cond) {check;}} while (0)
-
-BOOLEAN _p_Test(poly p, ring r, int level);
-BOOLEAN _p_LmTest(poly p, ring r, int level);
-BOOLEAN _pp_Test(poly p, ring lmRing, ring tailRing, int level);
-
-#define p_Test(p,r)     _p_Test(p, r, PDEBUG)
-#define p_LmTest(p,r)   _p_LmTest(p, r, PDEBUG)
-#define pp_Test(p, lmRing, tailRing)    _pp_Test(p, lmRing, tailRing, PDEBUG)
-
-#else // ! PDEBUG
-
-#define pIsMonomOf(p, q)        (TRUE)
-#define pHaveCommonMonoms(p, q) (TRUE)
-#define p_LmCheckIsFromRing(p,r)  ((void)0)
-#define p_LmCheckPolyRing(p,r)    ((void)0)
-#define p_CheckIsFromRing(p,r)  ((void)0)
-#define p_CheckPolyRing(p,r)    ((void)0)
-#define p_CheckRing(r)          ((void)0)
-#define P_CheckIf(cond, check)  ((void)0)
-
-#define p_Test(p,r)     (1)
-#define p_LmTest(p,r)   (1)
-#define pp_Test(p, lmRing, tailRing) (1)
-
-#endif
+
 
 /***************************************************************
@@ -438 +445 @@
   return __p_GetComp(p,r) -= v;
 }
-static inline int p_Comp_k_n(poly a, poly b, int k, ring r)
-{
-  if ((a==NULL) || (b==NULL) ) return FALSE;
-  p_LmCheckPolyRing2(a, r);
-  p_LmCheckPolyRing2(b, r);
-  pAssume2(k > 0 && k <= r->N);
-  int i=k;
-  for(;i<=r->N;i++)
-  {
-    if (p_GetExp(a,i,r) != p_GetExp(b,i,r)) return FALSE;
-    //    if (a->exp[(r->VarOffset[i] & 0xffffff)] != b->exp[(r->VarOffset[i] & 0xffffff)]) return FALSE;
-  }
-  return TRUE;
-}
 
 #ifndef HAVE_EXPSIZES
@@ -582 +575 @@
 }
 
-
-
-
-
 // the following should be implemented more efficiently
 static inline  long p_IncrExp(poly p, int v, ring r)
@@ -634 +623 @@
 {
   return p_GetExp(p1,i,r) - p_GetExp(p2,i,r);
+}
+
+static inline int p_Comp_k_n(poly a, poly b, int k, ring r)
+{
+  if ((a==NULL) || (b==NULL) ) return FALSE;
+  p_LmCheckPolyRing2(a, r);
+  p_LmCheckPolyRing2(b, r);
+  pAssume2(k > 0 && k <= r->N);
+  int i=k;
+  for(;i<=r->N;i++)
+  {
+    if (p_GetExp(a,i,r) != p_GetExp(b,i,r)) return FALSE;
+    //    if (a->exp[(r->VarOffset[i] & 0xffffff)] != b->exp[(r->VarOffset[i] & 0xffffff)]) return FALSE;
+  }
+  return TRUE;
 }