Changeset bb6c8a in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

21c6b368221deec3e5484f0c925b9ea662ef2f90

Parents:

5948a892b49a72bd59d66e6d9874e51bcefaf93c

git-author:

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

git-committer:

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

Message:

FIX: poly-cmp procedures should be in a correct order

File:

• libpolys/polys/monomials/p_polys.h (modified) (3 diffs)

libpolys/polys/monomials/p_polys.h

@@ -39 +39 @@
 #define __p_GetComp(p, r)   (p)->exp[r->pCompIndex]
 #define p_GetComp(p, r)    ((long) (r->pCompIndex >= 0 ? __p_GetComp(p, r) : 0))
-
-/***************************************************************
- *
- * Comparisons: they are all done without regarding coeffs
- *
- ***************************************************************/
-#define p_LmCmpAction(p, q, r, actionE, actionG, actionS) \
-  _p_LmCmpAction(p, q, r, actionE, actionG, actionS)
-
-// returns 1 if ExpVector(p)==ExpVector(q): does not compare numbers !!
-#define p_LmEqual(p1, p2, r) p_ExpVectorEqual(p1, p2, r)
 
 /***************************************************************
@@ -709 +698 @@
  ***************************************************************/
 
-// pCmp: args may be NULL
-// returns: (p2==NULL ? 1 : (p1 == NULL ? -1 : p_LmCmp(p1, p2)))
-static inline int p_Cmp(poly p1, poly p2, ring r)
-{
-  if (p2==NULL)
-    return 1;
-  if (p1==NULL)
-    return -1;
-  return p_LmCmp(p1,p2,r);
-}
 
 static inline unsigned long p_GetMaxExp(const poly p, const ring r)
@@ -1477 +1456 @@
   p_MemCmp_LengthGeneral_OrdGeneral(p->exp, q->exp, r->CmpL_Size, r->ordsgn,
                                     return 0, return 1, return -1);
+}
+
+
+
+/***************************************************************
+ *
+ * Comparisons: they are all done without regarding coeffs
+ *
+ ***************************************************************/
+#define p_LmCmpAction(p, q, r, actionE, actionG, actionS) \
+  _p_LmCmpAction(p, q, r, actionE, actionG, actionS)
+
+// returns 1 if ExpVector(p)==ExpVector(q): does not compare numbers !!
+#define p_LmEqual(p1, p2, r) p_ExpVectorEqual(p1, p2, r)
+
+// pCmp: args may be NULL
+// returns: (p2==NULL ? 1 : (p1 == NULL ? -1 : p_LmCmp(p1, p2)))
+static inline int p_Cmp(poly p1, poly p2, ring r)
+{
+  if (p2==NULL)
+    return 1;
+  if (p1==NULL)
+    return -1;
+  return p_LmCmp(p1,p2,r);
 }