Changeset e84421 in git

Timestamp:

Jul 25, 2011, 5:02:43 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f32381cc5321a6e0dfafe932d999404e0190fd5c

Parents:

e533660f00e4b44288438fadc044c2920f73f40c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-25 17:02:43+02:00

git-committer:

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

Message:

fix kstdfac.cc

File:

• kernel/kstdfac.cc (modified) (8 diffs)

kernel/kstdfac.cc

@@ -253 +253 @@
 BOOLEAN k_factorize(poly p,ideal &rfac, ideal &fac_copy)
 {
-  int facdeg=pFDeg(p,currRing);
-  ideal fac=singclap_factorize(pCopy(p),NULL,1);
+  int facdeg=currRing->pFDeg(p,currRing);
+  ideal fac=singclap_factorize(pCopy(p),NULL,1,currRing);
   int fac_elems;
 #ifndef HAVE_FACTORY
@@ -269 +269 @@
   fac_copy=idInit(fac_elems,1);
 
-  if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0],currRing)))
+  if ((fac_elems!=1)||(facdeg!=currRing->pFDeg(fac->m[0],currRing)))
   {
     if (TEST_OPT_DEBUG)
@@ -568 +568 @@
     if (TEST_OPT_DEGBOUND
     && ((strat->honey
-        && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
-      || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
+        && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+      || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     {
       /*
@@ -594 +594 @@
     {
       if (TEST_OPT_PROT)
-        message(strat->P.ecart+pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
+        message(strat->P.ecart+currRing->pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     else
     {
       if (TEST_OPT_PROT)
-        message(pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
+        message(currRing->pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     /* reduction of the element choosen from L */
@@ -884 +884 @@
   if (TEST_OPT_WEIGHTM)
   {
-    pRestoreDegProcs(pFDegOld, pLDegOld);
+    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     if (ecartWeights)
     {
@@ -907 +907 @@
   ideal_list L=NULL;
 
-  if (rField_has_simple_inverse())
+  if (rField_has_simple_inverse(currRing))
     strat->LazyPass=20;
   else
     strat->LazyPass=2;
   strat->LazyDegree = 1;
-  strat->ak = idRankFreeModule(F);
+  strat->ak = id_RankFreeModule(F,currRing);
   if ((h==testHomog))
   {
@@ -929 +929 @@
       kModW = *w;
       strat->kModW = *w;
-      pFDegOld = pFDeg;
+      pFDegOld = currRing->pFDeg;
       pLDegOld = pLDeg;
-      pSetDegProcs(kModDeg);
+      pSetDegProcs(currRing,kModDeg);
       toReset = TRUE;
     }
@@ -1032 +1032 @@
   if (toReset)
   {
-    pRestoreDegProcs(pFDegOld, pLDegOld);
+    pRestoreDegProcs(currRing,pFDegOld, pLDegOld);
     kModW = NULL;
   }