Changeset 13366d in git

Timestamp:

Apr 20, 2011, 5:56:26 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

c5412f9a6a13ab8833d5cbe0867056162b572292

Parents:

dd693af15271046d17b3936568ad7f4e972fe37a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-20 17:56:26+02:00

git-committer:

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

Message:

FIX: rSetISReference
FIX: sca should not rely on kNF/sca_bba for the time being => commented out

Location:

libpolys

Files:

• polys/monomials/ring.cc (modified) (7 diffs)
• polys/monomials/ring.h (modified) (2 diffs)
• polys/nc/sca.cc (modified) (5 diffs)
• tests/Makefile.am (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -14 +14 @@
 #include <omalloc/omalloc.h>
 #include <misc/options.h>
-#include <misc/intvec.h>
 #include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>
@@ -2733 +2732 @@
 
 
-bool rSetISReference(const ideal F, const int i, const int p, const intvec * componentWeights, const ring r);
-
-
 /*2
  * create a copy of the ring r, which must be equivalent to currRing
@@ -2949 +2945 @@
           ideal F = idrHeadR(r->typ[i].data.is.F, r, res); // Copy F from r into res!
           assume(
-            rSetISReference(
+            rSetISReference( res, 
               F,  // WILL BE COPIED!
               r->typ[i].data.is.limit,
               j++,
-              r->typ[i].data.is.componentWeights, // WILL BE COPIED
-              res)
+              r->typ[i].data.is.componentWeights // WILL BE COPIED
+              )
             );
           id_Delete(&F, res);
@@ -4942 +4938 @@
 /// We will use it AS IS!
 /// returns true is everything was allright!
-bool rSetISReference(const ideal F, const ring r,const int i = 0, const int p = 0, const intvec * componentWeights = NULL)
+BOOLEAN rSetISReference(const ring r, const ideal F, const int i, const int p, const intvec * componentWeights)
 {
   // Put the reference set F into the ring -ordering -recor
@@ -4957 +4953 @@
   {
     dReportError("Error: WRONG USE of rSetISReference: wrong ring! (typ == NULL)");
-    return false;
+    return FALSE;
   }
 
@@ -4966 +4962 @@
   {
     dReportError("Error: WRONG USE of rSetISReference: specified ordering block was not found!!!" );
-    return false;
+    return FALSE;
   }
 
@@ -5013 +5009 @@
 #endif
 
-  return true;
+  return TRUE;
 }
 

libpolys/polys/monomials/ring.h

@@ -10 +10 @@
 
 /* includes */
+#include <omalloc/omalloc.h>
+#include <misc/auxiliary.h>
 #include <coeffs/coeffs.h>
-#include <omalloc/omalloc.h>
 //#include <polys/monomials/polys-impl.h>
 //
@@ -664 +665 @@
 //
 
+BOOLEAN rSetISReference(const ring r, const ideal F, const int i = 0, const int p = 0, const intvec * componentWeights = NULL);
+
 BOOLEAN rCheckIV(intvec *iv);
 int rTypeOfMatrixOrder(intvec * order);

libpolys/polys/nc/sca.cc

@@ -82 +82 @@
 poly sca_ReduceSpoly(const poly p1, poly p2, const ring r);
 
+/*
 // Modified Plural's Buchberger's algorithmus.
 ideal sca_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat, const ring _currRing);
@@ -90 +91 @@
 // Modified modern Sinuglar Mora's algorithm.
 ideal sca_mora(const ideal F, const ideal Q, const intvec *w, const intvec *, kStrategy strat, const ring _currRing);
+*/
 
 
@@ -1497 +1499 @@
     // NOTE: rSaveRing == currRing now!
     // NOTE: there is no better way to check this in general!
-    extern poly kNF(ideal I, ideal Q, poly f, int a, int b, const ring r);
-
-    square = kNF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
+
+//////    TODO!!!!!
+//////    extern poly kNF(ideal I, ideal Q, poly f, int a, int b, const ring r);
+//////    square = kNF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
 
     if( square != NULL ) // var(i)^2 is not in Q?
@@ -2532 +2535 @@
 //           Print("Local case => GB == mora!\n");
 #endif
-    rGR->GetNC()->p_Procs.GB          = sca_mora; // local ordering => Mora, otherwise - Buchberger!
+    rGR->GetNC()->p_Procs.GB          = NULL; // sca_mora; // local ordering => Mora, otherwise - Buchberger!
   }
   else
@@ -2539 +2542 @@
 //           Print("Global case => GB == bba!\n");
 #endif
-    rGR->GetNC()->p_Procs.GB          = sca_bba; // sca_gr_bba; // sca_bba? // sca_bba;
+    rGR->GetNC()->p_Procs.GB          = NULL; // sca_bba; // sca_gr_bba; // sca_bba? // sca_bba;
   }
 

libpolys/tests/Makefile.am

@@ -23 +23 @@
 
 coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc -lomalloc_debug
-polys_test_LDADD = -lpolys_g $(coeffs_test_LDADD)
+polys_test_LDADD = -lpolys_g -ldl $(coeffs_test_LDADD)