Changeset 31f1850 in git for kernel/ideals.cc

Timestamp:

Jan 10, 2012, 4:20:10 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

930ea815182bc9bf3182f1c57876006af26295b2

Parents:

a74143eec598021f060c389b66230f8f035cc1c5

Message:

chg: pDeg leads to confusion, removed to p_Deg

File:

• kernel/ideals.cc (modified) (4 diffs)

kernel/ideals.cc

@@ -1224 +1224 @@
   for(i=IDELEMS(Q)-1;i>=0;i--)
     if(w==NULL)
-      N=si_max(N,pDeg(Q->m[i]));
+      N=si_max(N,p_Deg(Q->m[i],currRing));
     else
       N=si_max(N,pDegW(Q->m[i],w));
@@ -1251 +1251 @@
           p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
         pNormalize(p);
-        if((w==NULL)&&(pDeg(p0)>n)||(w!=NULL)&&(pDegW(p0,w)>n))
+        if((w==NULL)&&(p_Deg(p0,currRing)>n)||(w!=NULL)&&(pDegW(p0,w)>n))
           p_Delete(&p0,currRing);
         else
@@ -1264 +1264 @@
           pIter(p);
           pNext(p0)=NULL;
-          if(((w==NULL)&&(pDeg(p0)>n))
+          if(((w==NULL)&&(p_Deg(p0,currRing)>n))
           ||((w!=NULL)&&(pDegW(p0,w)>n)))
             p_Delete(&p0,currRing);
@@ -2133 +2133 @@
       if (p!=NULL)
       {
-        d = pDeg(p);
+        d = p_Deg(p,currRing);
         k= pGetComp(p);
         if (slength>0) k--;