Changeset 9b3700 in git

Timestamp:

Jul 20, 2011, 4:46:43 PM (13 years ago)

Author:

mlee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

48cf05bb3d2a2234c35b5e4f732668df3b3df5c8

Parents:

2cbef915697324ddbff28f775df52a7ee954c3ad

git-author:

mlee <martinlee84@web.de>2011-07-20 16:46:43+02:00

git-committer:

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

Message:

added n_ExtGcd, n_IntMod and n_DivComp to coeffs.h
added currRing, currRing->cf at appropiate places in kutil.cc

Files:

• kernel/kutil.cc (modified) (22 diffs)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)

kernel/kutil.cc

@@ -12 +12 @@
 #include <stdlib.h>
 #include <string.h>
-#include <kernel/mod2.h>
+#include "mod2.h"
 
 #ifndef NDEBUG
@@ -322 +322 @@
   poly h;
 
-  if(rHasGlobalOrdering_currRing()) return;
+  if(rHasGlobalOrdering (currRing)) return;
   if(TEST_OPT_CANCELUNIT) return;
 
@@ -1058 +1058 @@
   Lp->FDeg = Lp->pFDeg();
   (*Lp).ecart = si_max(ecartF,ecartG);
-  (*Lp).ecart = (*Lp).ecart- (Lp->FDeg -pFDeg((*Lp).lcm,currRing));
+  (*Lp).ecart = (*Lp).ecart- (Lp->FDeg -p_FDeg((*Lp).lcm,currRing));
   (*Lp).length = 0;
 }
@@ -1086 +1086 @@
   /*- computes the lcm(s[i],p) -*/
   Lp.lcm = pInit();
-  pSetCoeff0(Lp.lcm, nLcm(pGetCoeff(p), pGetCoeff(strat->S[i]), currRing));
+  pSetCoeff0(Lp.lcm, n_Lcm(pGetCoeff(p), pGetCoeff(strat->S[i]), currRing->cf));
   // Lp.lcm == 0
   if (nIsZero(pGetCoeff(Lp.lcm)))
@@ -1109 +1109 @@
   pSetm(Lp.lcm);
   assume(!strat->sugarCrit);
-  if (pHasNotCF(p,strat->S[i]) && nIsUnit(pGetCoeff(p)) && nIsUnit(pGetCoeff(strat->S[i])))
+  if (pHasNotCF(p,strat->S[i]) && n_IsUnit(pGetCoeff(p),currRing->cf)
+      && n_IsUnit(pGetCoeff(strat->S[i]),currRing->cf))
   {
 #ifdef KDEBUG
@@ -1136 +1137 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nDivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
+    compareCoeff = n_DivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm), currRing->cf);
     if (compareCoeff == pDivComp_EQUAL || compare == compareCoeff)
     {
@@ -1301 +1302 @@
   poly m1, m2, gcd;
 
-  d = nExtGcd(pGetCoeff(p), pGetCoeff(strat->S[i]), &s, &t);
+  d = n_ExtGcd(pGetCoeff(p), pGetCoeff(strat->S[i]), &s, &t, currRing->cf);
 
   if (nIsZero(s) || nIsZero(t))  // evtl. durch divBy tests ersetzen
@@ -2393 +2394 @@
   for (j=strat->Ll; j>=0; j--)
   {
-    if (strat->L[j].lcm != NULL && nDivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(p)))
+    if (strat->L[j].lcm != NULL && n_DivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(p), currRing->cf))
     {
       if (pCompareChain(p,strat->L[j].p1,strat->L[j].p2,strat->L[j].lcm))
@@ -2446 +2447 @@
         if (i < 0)  break;
         // Element is from B and has the same lcm as L[j]
-        if ((strat->L[i].p2 == p) && nDivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm))
+        if ((strat->L[i].p2 == p) && n_DivBy(pGetCoeff(strat->L[j].lcm), pGetCoeff(strat->L[i].lcm), currRing->cf)
              && pLmEqual(strat->L[j].lcm,strat->L[i].lcm))
         {
@@ -2952 +2953 @@
   number gcd;
   bool go = false;
-  if (nDivBy((number) 0, pGetCoeff(h)))
+  if (n_DivBy((number) 0, pGetCoeff(h), currRing->cf))
   {
     gcd = nIntDiv((number) 0, pGetCoeff(h));
@@ -3274 +3275 @@
           if (cmp == cmp_int)  return an;
           if (cmp == -cmp_int) return en;
-          if (nDivBy(pGetCoeff(p), pGetCoeff(set[an]))) return en;
+          if (n_DivBy(pGetCoeff(p), pGetCoeff(set[an]), currRing->cf)) return en;
           return an;
         }
@@ -3283 +3284 @@
         else
         {
-          if (nDivBy(pGetCoeff(p), pGetCoeff(set[i]))) an = i;
+          if (n_DivBy(pGetCoeff(p), pGetCoeff(set[i]), currRing->cf)) an = i;
           else en = i;
         }
@@ -4656 +4657 @@
       poly p_Ln=Ln.GetLmCurrRing();
       poly p_With=With->GetLmCurrRing();
-      number z=nIntMod(pGetCoeff(p_Ln),pGetCoeff(p_With));
+      number z=n_IntMod(pGetCoeff(p_Ln),pGetCoeff(p_With), currRing->cf);
       if (!nIsZero(z))
       {
@@ -4917 +4918 @@
   if ((strat->sl>=0)
 #ifdef HAVE_RINGS
-       && nIsUnit(pGetCoeff(strat->S[0]))
+       && n_IsUnit(pGetCoeff(strat->S[0]),currRing->cf)
 #endif
        && pIsConstant(strat->S[0]))
@@ -5016 +5017 @@
   if ((strat->Ll>=0)
 #ifdef HAVE_RINGS
-       && nIsUnit(pGetCoeff(strat->L[strat->Ll].p))
+       && n_IsUnit(pGetCoeff(strat->L[strat->Ll].p), currRing->cf)
 #endif
        && pIsConstant(strat->L[strat->Ll].p))
@@ -5309 +5310 @@
   if (maxIndex >= 0)
   {
-    e = pLDeg(h,&l,currRing)-pFDeg(h,currRing);
+    e = pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
     do
     {
@@ -5326 +5327 @@
         // pDelete(&h);
         if (h == NULL) return NULL;
-        e = pLDeg(h,&l,currRing)-pFDeg(h,currRing);
+        e = pLDeg(h,&l,currRing)-p_FDeg(h,currRing);
         j = 0;
         not_sev = ~ pGetShortExpVector(h);
@@ -6241 +6242 @@
   /* compare old and new noether*/
   newNoether = pLmInit(strat->kHEdge);
-  j = pFDeg(newNoether,currRing);
+  j = p_FDeg(newNoether,currRing);
   for (i=1; i<=(currRing->N); i++)
   {
@@ -6350 +6351 @@
                                   // might be too strong
 #ifdef HAVE_RINGS
-                                  (strat->homog && pFDeg == pDeg && !(rField_is_Ring(currRing))), // TODO Oliver
+                                  (strat->homog && currRing->pFDeg == pDeg && !(rField_is_Ring(currRing))), // TODO Oliver
 #else
                                   (strat->homog && pFDeg == pDeg), // omit_degree
@@ -6486 +6487 @@
   tailBin = omGetStickyBinOfBin(currRing->PolyBin);
 #endif
-  pOrigFDeg = pFDeg;
+  pOrigFDeg = currRing->pFDeg;
   pOrigLDeg = pLDeg;
 }
@@ -6506 +6507 @@
   if (currRing != tailRing)
     rKillModifiedRing(tailRing);
-  pRestoreDegProcs(pOrigFDeg, pOrigLDeg);
+  pRestoreDegProcs(currRing,pOrigFDeg, pOrigLDeg);
 }
 
@@ -6755 +6756 @@
     else if (strat->tailRing->pLDeg==pLDeg1c_WFirstTotalDegree) PrintS("pLDeg1c_WFirstTotalDegree");
     else Print("? (%lx)", (long)strat->tailRing->pLDeg);
-    Print(" syzring:%d, syzComp(strat):%d syzComb(ring)\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit());
+    Print(" syzring:%d, syzComp(strat):%d syzComb(ring)\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit(currRing));
     if(TEST_OPT_DEGBOUND)
       Print(" degBound: %d\n", Kstd1_deg);

libpolys/coeffs/coeffs.h

@@ -342 +342 @@
 { assume(r != NULL); assume(r->cfIsUnit!=NULL); return r->cfIsUnit(n,r); }
 
+static inline number n_ExtGcd(number a, number b, number *s, number *t, const coeffs r)
+{ assume(r != NULL); assume(r->cfExtGcd!=NULL); return r->cfExtGcd (a,b,s,t,r); }
+
+static inline int n_DivComp(number a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfDivComp!=NULL); return r->cfDivComp (a,b,r); }
+
 /// in Z: 1
 /// in Z/kZ (where k is not a prime): largest divisor of n (taken in Z) that
@@ -443 +449 @@
 { assume(r != NULL); assume(r->cfIntDiv!=NULL); return r->cfIntDiv(a,b,r); }
 
+static inline number n_IntMod(number a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfIntMod!=NULL); return r->cfIntMod(a,b,r); }
 /// @todo: Describe me!!!
 ///