Changeset e044528 in git

Timestamp:

Sep 8, 2011, 9:16:31 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

d02fff666539bb449e45ae13851d7d81e05c75bc

Parents:

f7aa4c7c61207b077fe954f2e563ca261edcc109

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-08 21:16:31+02:00

git-committer:

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

Message:

FIX: pCompareChain & pCompareChainPart

Location:

kernel

Files:

• kpolys.cc (modified) (3 diffs)
• makefile (modified) (1 diff)
• polys.h (modified) (1 diff)
• ratgring.h (modified) (1 diff)

kernel/kpolys.cc

@@ +1 @@
+#include "mod2.h"
+
+#include <omalloc/omalloc.h>
+#include <misc/auxiliary.h>
+
+#include "polys.h"
+
+
 /* Returns TRUE if
      * LM(p) | LM(lcm)
@@ -8 +16 @@
          * LE(p2, j) != LE(lcm, j)   ==> LCM(p2, p) != lcm
 */
-BOOLEAN pCompareChain (poly p,poly p1,poly p2,poly lcm, const ring R = currRing)
+BOOLEAN pCompareChain (poly p,poly p1,poly p2,poly lcm, const ring R)
 {
   int k, j;
@@ -61 +69 @@
 }
 #ifdef HAVE_RATGRING
-BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm,
-                const ring R = currRing)
+BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm, const ring R)
 {
   int k, j;

kernel/makefile

@@ -73 +73 @@
     fast_maps.cc \
     fglmzero.cc fglmvec.cc fglmgauss.cc fglmhom.cc fglmcomb.cc \
-    kspoly.cc \
+    kspoly.cc kpolys.cc \
     semic.cc \
     syz.cc syz0.cc syz1.cc syz2.cc syz3.cc\

kernel/polys.h

@@ -351 +351 @@
 
 /*-----------specials for spoly-computations--------------*/
-BOOLEAN pCompareChain (poly p,poly p1,poly p2,poly lcm);
-BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm);
+
+/// Returns TRUE if
+///      * LM(p) | LM(lcm)
+///      * LC(p) | LC(lcm) only if ring
+///      * Exists i, j:
+///          * LE(p, i)  != LE(lcm, i)
+///          * LE(p1, i) != LE(lcm, i)   ==> LCM(p1, p) != lcm
+///          * LE(p, j)  != LE(lcm, j)
+///          * LE(p2, j) != LE(lcm, j)   ==> LCM(p2, p) != lcm
+BOOLEAN pCompareChain (poly p, poly p1, poly p2, poly lcm, const ring R = currRing);
+
 #define  pEqualPolys(p1,p2) p_EqualPolys(p1,p2,currRing)
+
 
 

kernel/ratgring.h

@@ -121 +121 @@
 BOOLEAN p_LmIsConstantCompRat(const poly p, const ring r);
 
+BOOLEAN pCompareChainPart (poly p,poly p1,poly p2,poly lcm);
+
 #endif /* HAVE_PLURAL */
 #endif