Changeset b130fb in git

Timestamp:

Feb 17, 2005, 10:42:23 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

08db0a0dca2c73d19b0d83ba8110def246830498

Parents:

ecce503e3c38e63f043db34fbea817c3fc1fdc6c

Message:

*hannes: gcc-3.4


git-svn-id: file:///usr/local/Singular/svn/trunk@7733 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• gr_kstd2.cc (modified) (12 diffs)
• ideals.cc (modified) (5 diffs)
• khstd.cc (modified) (3 diffs)
• kstd1.cc (modified) (6 diffs)
• kstd2.cc (modified) (2 diffs)
• kstdfac.cc (modified) (5 diffs)
• kutil.cc (modified) (8 diffs)
• kutil.h (modified) (2 diffs)
• polys1.cc (modified) (2 diffs)
• structs.h (modified) (2 diffs)
• syz.cc (modified) (10 diffs)
• syz0.cc (modified) (3 diffs)
• syz2.cc (modified) (2 diffs)
• syz3.cc (modified) (19 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.4 2004-11-09 14:54:59 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.5 2005-02-17 09:42:18 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -50 +50 @@
   int j = 0;
 
-  d = pFDeg((*h).p)+(*h).ecart;
+  d = pFDeg((*h).p,currRing)+(*h).ecart;
   reddeg = strat->LazyDegree+d;
   loop
@@ -93 +93 @@
       }
       /*computes the ecart*/
-      d = pLDeg((*h).p,&((*h).length));
-      (*h).FDeg=pFDeg((*h).p);
+      d = pLDeg((*h).p,&((*h).length),currRing);
+      (*h).FDeg=pFDeg((*h).p,currRing);
       (*h).ecart = d-(*h).FDeg; /*pFDeg((*h).p);*/
       if ((strat->syzComp!=0) && !strat->honey)
@@ -298 +298 @@
   int j = 0;
   int pass = 0;
-  int reddeg = pFDeg((*h).p);
+  int reddeg = pFDeg((*h).p,currRing);
 
   if (TEST_OPT_DEBUG)
@@ -343 +343 @@
       /*- try to reduce the s-polynomial -*/
       pass++;
-      d = pFDeg((*h).p);
+      d = pFDeg((*h).p,currRing);
       if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
       {
@@ -409 +409 @@
 
   pass = j = 0;
-  d = reddeg = pFDeg((*h).p)+(*h).ecart;
+  d = reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
   if (TEST_OPT_DEBUG)
   {
@@ -498 +498 @@
       /* compute the ecart */
       if (ei <= (*h).ecart)
-        (*h).ecart = d-pFDeg((*h).p);
+        (*h).ecart = d-pFDeg((*h).p,currRing);
       else
-        (*h).ecart = d-pFDeg((*h).p)+ei-(*h).ecart;
+        (*h).ecart = d-pFDeg((*h).p,currRing)+ei-(*h).ecart;
 //      if (strat->syzComp)
 //      {
@@ -520 +520 @@
       */
       pass++;
-      d = pFDeg((*h).p)+(*h).ecart;
+      d = pFDeg((*h).p,currRing)+(*h).ecart;
       if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
       {
@@ -587 +587 @@
 
   if (strat->honey)
-    reddeg = pFDeg((*h).p)+(*h).ecart;
+    reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
   else
-    reddeg = pFDeg((*h).p);
+    reddeg = pFDeg((*h).p,currRing);
   loop
   {
@@ -686 +686 @@
       {
         pass++;
-        d = pFDeg((*h).p);
+        d = pFDeg((*h).p,currRing);
         if (strat->honey)
           d += (*h).ecart;
@@ -808 +808 @@
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND
-    && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))
-       || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))))
+    && ((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))))
     {
       /*
@@ -887 +888 @@
               if (strat->sl==-1) pos=0;
               else pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
-              strat->enterS(strat->P,pos,strat);
+              strat->enterS(strat->P,pos,strat,-1);
             }
             if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.5 2004-07-16 08:42:59 Singular Exp $ */
+/* $Id: ideals.cc,v 1.6 2005-02-17 09:42:19 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2922 +2922 @@
       else
       //  order = p->order;
-        order = pFDeg(p);
+        order = pFDeg(p,currRing);
       order += diff[pGetComp(p)];
       p = F[i];
@@ -2935 +2935 @@
       //else
       //  ord = p->order;
-      ord = pFDeg(p);
+      ord = pFDeg(p,currRing);
       if (!iscom[pGetComp(p)])
       {
@@ -3015 +3015 @@
     if (p!=NULL)
     {
-      int d=pFDeg(p);
+      int d=pFDeg(p,currRing);
       loop
       {
         pIter(p);
         if (p==NULL) break;
-        if (d!=pFDeg(p)) 
+        if (d!=pFDeg(p,currRing)) 
         {
           // pWrite(q); wrp(p); Print(" -> %d - %d\n",d,pFDeg(p)); 
@@ -3300 +3300 @@
   while (i>0)
   {
-    (*result)[i]=pFDeg(mod->m[i])+(*weights)[pGetComp(mod->m[i])];
+    (*result)[i]=pFDeg(mod->m[i],currRing)+(*weights)[pGetComp(mod->m[i])];
   }
   return result;

kernel/khstd.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: khstd.cc,v 1.1.1.1 2003-10-06 12:15:54 Singular Exp $ */
+/* $Id: khstd.cc,v 1.2 2005-02-17 09:42:19 Singular Exp $ */
 /*
 * ABSTRACT:utils for hilbert driven kStd
@@ -57 +57 @@
     newhilb = hHstdSeries(strat->Shdl,w,strat->kHomW,Q,strat->tailRing);
     ln = newhilb->length()-1;
-    deg = degp(strat->P.p)-mw;
+    deg = degp(strat->P.p,currRing)-mw;
     loop // compare the series in degree deg, try to increase deg -----------
     {
@@ -92 +92 @@
     } /* loop */
     delete newhilb;
-    while ((strat->Ll>=0) && (degp(strat->L[strat->Ll].p)-mw < deg)) // the essential step
+    while ((strat->Ll>=0) && (degp(strat->L[strat->Ll].p,currRing)-mw < deg)) // the essential step
     {
       count++;

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.4 2004-09-28 13:23:49 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.5 2005-02-17 09:42:19 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -447 +447 @@
   int z = 10;
   int o = H.SetpFDeg();
-  H.ecart = pLDeg(H.p,&H.length)-o;
+  H.ecart = pLDeg(H.p,&H.length,currRing)-o;
   if ((flag & 2) == 0) cancelunit(&H);
   H.sev = pGetShortExpVector(H.p);
@@ -526 +526 @@
       o = H.SetpFDeg();
       if ((flag &2 ) == 0) cancelunit(&H);
-      H.ecart = pLDeg(H.p,&(H.length))-o;
+      H.ecart = pLDeg(H.p,&(H.length),currRing)-o;
       j = 0;
       H.sev = pGetShortExpVector(H.p);
@@ -1059 +1059 @@
   if (strat->kHEdgeFound)
   {
-    strat->HCord = pFDeg(ppNoether)+1;
+    strat->HCord = pFDeg(ppNoether,currRing)+1;
     strat->posInT = posInT2;
   }
@@ -1294 +1294 @@
   {
     if (strat->kHEdge!=NULL)
-      Kstd1_mu=pFDeg(strat->kHEdge);
+      Kstd1_mu=pFDeg(strat->kHEdge,currRing);
     else
       Kstd1_mu=-1;
@@ -1753 +1753 @@
         for (i=IDELEMS(F)-1;i>=0;i--)
         {
-          if ((F->m[i]!=NULL) && (pFDeg(F->m[i])>=Kstd1_deg))
-            Kstd1_deg = pFDeg(F->m[i])+1;
+          if ((F->m[i]!=NULL) && (pFDeg(F->m[i],currRing)>=Kstd1_deg))
+            Kstd1_deg = pFDeg(F->m[i],currRing)+1;
         }
       }

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.1.1.1 2003-10-06 12:15:54 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.2 2005-02-17 09:42:20 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -506 +506 @@
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND
-        && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))
-            || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))))
+        && ((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))))
     {
       /*

kernel/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.1.1.1 2003-10-06 12:15:56 Singular Exp $ */
+/* $Id: kstdfac.cc,v 1.2 2005-02-17 09:42:20 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -239 +239 @@
 BOOLEAN k_factorize(poly p,ideal &rfac, ideal &fac_copy)
 {
-  int facdeg=pFDeg(p);
+  int facdeg=pFDeg(p,currRing);
   ideal fac=singclap_factorize(p,NULL,1);
   int fac_elems;
@@ -255 +255 @@
   fac_copy=idInit(fac_elems,1);
 
-  if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0])))
+  if ((fac_elems!=1)||(facdeg!=pFDeg(fac->m[0],currRing)))
   {
     if (TEST_OPT_DEBUG)
@@ -504 +504 @@
     if (TEST_OPT_DEGBOUND
     && ((strat->honey
-        && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))
-      || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))))
+        && (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))))
     {
       /*
@@ -530 +530 @@
     {
       if (TEST_OPT_PROT)
-        message(strat->P.ecart+pFDeg(strat->P.p),&olddeg,&reduc,strat, red_result);
+        message(strat->P.ecart+pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     else
     {
       if (TEST_OPT_PROT)
-        message(pFDeg(strat->P.p),&olddeg,&reduc,strat, red_result);
+        message(pFDeg(strat->P.p,currRing),&olddeg,&reduc,strat, red_result);
     }
     /* reduction of the element choosen from L */

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.5 2004-11-09 14:55:00 Singular Exp $ */
+/* $Id: kutil.cc,v 1.6 2005-02-17 09:42:20 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -973 +973 @@
   Lp->FDeg = Lp->pFDeg();
   (*Lp).ecart = si_max(ecartF,ecartG);
-  (*Lp).ecart = (*Lp).ecart- (Lp->FDeg -pFDeg((*Lp).lcm));
+  (*Lp).ecart = (*Lp).ecart- (Lp->FDeg -pFDeg((*Lp).lcm,currRing));
   (*Lp).length = 0;
 }
@@ -3061 +3061 @@
           }
           h.sev = pGetShortExpVector(h.p);
-          strat->enterS(h,pos,strat);
+          strat->enterS(h,pos,strat,-1);
           strat->fromQ[pos]=1;
         }
@@ -3095 +3095 @@
           pos = posInS(strat,strat->sl,h.p,h.ecart);
         h.sev = pGetShortExpVector(h.p);
-        strat->enterS(h,pos,strat);
+        strat->enterS(h,pos,strat,-1);
       }
     }
@@ -3152 +3152 @@
           }
           h.sev = pGetShortExpVector(h.p);
-          strat->enterS(h,pos,strat);
+          strat->enterS(h,pos,strat,-1);
           strat->fromQ[pos]=1;
         }
@@ -3476 +3476 @@
   if (maxIndex >= 0)
   {
-    e = pLDeg(h,&l)-pFDeg(h);
+    e = pLDeg(h,&l,currRing)-pFDeg(h,currRing);
     do
     {
@@ -3495 +3495 @@
         // pDelete(&h);
         if (h == NULL) return NULL;
-        e = pLDeg(h,&l)-pFDeg(h);
+        e = pLDeg(h,&l,currRing)-pFDeg(h,currRing);
         j = 0;
         not_sev = ~ pGetShortExpVector(h);
@@ -4238 +4238 @@
   /* compare old and new noether*/
   newNoether = pLmInit(strat->kHEdge);
-  j = pFDeg(newNoether);
+  j = pFDeg(newNoether,currRing);
   for (i=1; i<=pVariables; i++)
   {

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.2 2004-08-03 17:33:56 Singular Exp $ */
+/* $Id: kutil.h,v 1.3 2005-02-17 09:42:21 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -233 +233 @@
   int (*posInL)(const LSet set, const int length,
                 LObject* L,const kStrategy strat);
-  void (*enterS)(LObject h, int pos,kStrategy strat, int atR = -1);
+  void (*enterS)(LObject h, int pos,kStrategy strat, int atR/* =-1*/ );
   void (*initEcartPair)(LObject * h, poly f, poly g, int ecartF, int ecartG);
   int (*posInLOld)(const LSet Ls,const int Ll,

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.7 2005-01-27 16:44:13 Singular Exp $ */
+/* $Id: polys1.cc,v 1.8 2005-02-17 09:42:22 Singular Exp $ */
 
 /*
@@ -1026 +1026 @@
   if ((p == NULL) || (pNext(p) == NULL)) return TRUE;
   pFDegProc d=(pLexOrder ? pTotaldegree : pFDeg );
-  o = d(p);
+  o = d(p,currRing);
   do
   {
-    if (d(qp) != o) return FALSE;
+    if (d(qp,currRing) != o) return FALSE;
     pIter(qp);
   }

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.3 2003-12-16 18:30:31 levandov Exp $ */
+/* $Id: structs.h,v 1.4 2005-02-17 09:42:22 Singular Exp $ */
 /*
 * ABSTRACT
@@ -285 +285 @@
 /* the function pointer types */
 
-typedef long     (*pLDegProc)(poly p, int *length, ring r= currRing);
-typedef long     (*pFDegProc)(poly p, ring r = currRing);
-typedef void     (*p_SetmProc)(poly p, ring r = currRing);
+typedef long     (*pLDegProc)(poly p, int *length, ring r);
+typedef long     (*pFDegProc)(poly p, ring r);
+typedef void     (*p_SetmProc)(poly p, ring r);
 
 typedef enum

kernel/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.6 2004-10-26 15:40:28 levandov Exp $ */
+/* $Id: syz.cc,v 1.7 2005-02-17 09:42:22 Singular Exp $ */
 
 /*
@@ -62 +62 @@
     if (arg->m[i-maxxx]!=NULL)
     {
-      (*w1)[i] = pFDeg(arg->m[i-maxxx]);
+      (*w1)[i] = pFDeg(arg->m[i-maxxx],currRing);
       if (pGetComp(arg->m[i-maxxx])!=0)
       {
@@ -478 +478 @@
     if (j<IDELEMS(res[0]))
     {
-      if (pFDeg(res[0]->m[j])!=pTotaldegree(res[0]->m[j]))
+      if (pFDeg(res[0]->m[j],currRing)!=pTotaldegree(res[0]->m[j]))
         setRegularity = FALSE;
     }
@@ -562 +562 @@
         if (res[syzIndex-1]->m[i]!=NULL) // hs
         {
-          (*w)[i + rGetCurrSyzLimit()] = pFDeg(res[syzIndex-1]->m[i]);
+          (*w)[i + rGetCurrSyzLimit()] = pFDeg(res[syzIndex-1]->m[i],currRing);
           if (pGetComp(res[syzIndex-1]->m[i])>0)
             (*w)[i + rGetCurrSyzLimit()]
@@ -572 +572 @@
       {
         if (res[syzIndex]->m[i-k]!=NULL)
-          (*w)[i+rGetCurrSyzLimit()] = pFDeg(res[syzIndex]->m[i-k])
+          (*w)[i+rGetCurrSyzLimit()] = pFDeg(res[syzIndex]->m[i-k],currRing)
                     +(*w)[pGetComp(res[syzIndex]->m[i-k])-1];
       }
@@ -697 +697 @@
     if (homog)
     {
-      if (index==0)      k = pFDeg(temp->m[j])+degrees[pGetComp(temp->m[j])];
-      else               k = degrees[pGetComp(temp->m[j])];
+      if (index==0) k = pFDeg(temp->m[j],currRing)+degrees[pGetComp(temp->m[j])];
+      else          k = degrees[pGetComp(temp->m[j])];
       if (k>=index) tocancel[k-index]++;
       if ((k>=0) && (index==0)) subFromRank++;
@@ -822 +822 @@
           return NULL;
         }
-        temp2[j+1] = pFDeg(res[i]->m[j])+temp1[pGetComp(res[i]->m[j])];
+        temp2[j+1] = pFDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
         if (temp2[j+1]-i>rows) rows = temp2[j+1]-i;
         if (temp2[j+1]-i<mr) mr = temp2[j+1]-i;
@@ -885 +885 @@
       if (res[i]->m[j]!=NULL)
       {
-        temp2[j+1] = pFDeg(res[i]->m[j])+temp1[pGetComp(res[i]->m[j])];
+        temp2[j+1] = pFDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
         //(*result)[i+1+(temp2[j+1]-i-1)*cols]++;
         //if (temp2[j+1]>i) IMATELEM((*result),temp2[j+1]-i-mr,i+2)++;
@@ -1031 +1031 @@
       if (res[i]->m[j]!=NULL)
       {
-        k = pFDeg(res[i]->m[j])+(*(weights[i]))[pGetComp(res[i]->m[j])]-i-1;
+        k = pFDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i-1;
         if (k>rsmax) rsmax = k;
         if (k<rsmin) rsmin = k;
@@ -1070 +1070 @@
       if (res[i]->m[j]!=NULL)
       {
-        k = pFDeg(res[i]->m[j])+(*(weights[i]))[pGetComp(res[i]->m[j])]-i;
+        k = pFDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i;
         IMATELEM(*result,k-rsmin,i+2)++;
       }

kernel/syz0.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz0.cc,v 1.3 2004-06-03 12:27:07 Singular Exp $ */
+/* $Id: syz0.cc,v 1.4 2005-02-17 09:42:22 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -220 +220 @@
   {
     S[j] = pCopy(F[j]);
-    totalS[j] = pLDeg(S[j],&k);
-    ecartS[j] = totalS[j]-pFDeg(S[j]);
+    totalS[j] = pLDeg(S[j],&k,currRing);
+    ecartS[j] = totalS[j]-pFDeg(S[j],currRing);
 //Print("%d", pGetComp(S[j]));PrintS("  ");
     p = S[j];
@@ -330 +330 @@
 *         {
 */
-            totalToRed = pLDeg(toRed,&kk);
-            ecartToRed = totalToRed-pFDeg(toRed);
+            totalToRed = pLDeg(toRed,&kk,currRing);
+            ecartToRed = totalToRed-pFDeg(toRed,currRing);
 /*
 *         }

kernel/syz2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz2.cc,v 1.2 2004-06-02 14:54:54 Singular Exp $ */
+/* $Id: syz2.cc,v 1.3 2005-02-17 09:42:23 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -920 +920 @@
       for (j=0;j<k;j++)
       {
-        if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,pFDeg(toreor->m[j])-i+1,i+1))++;
+        if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,pFDeg(toreor->m[j],currRing)-i+1,i+1))++;
         reor->m[j] = toreor->m[j];
         toreor->m[j] = NULL;

kernel/syz3.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz3.cc,v 1.2 2004-06-02 15:59:12 Singular Exp $ */
+/* $Id: syz3.cc,v 1.3 2005-02-17 09:42:23 Singular Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -273 +273 @@
       if ((syzstr->regularity>0) && (res[syzIndex]->m[i]!=NULL))
       {
-        if (pFDeg(res[syzIndex]->m[i])>=syzstr->regularity+syzIndex)
+        if (pFDeg(res[syzIndex]->m[i],currRing)>=syzstr->regularity+syzIndex)
           pDelete(&res[syzIndex]->m[i]);
       }
@@ -335 +335 @@
       IDELEMS(old_repr) += 16;
     }
-    k = pFDeg(new_generators->m[i]);
+    k = pFDeg(new_generators->m[i],currRing);
     kk = pGetComp(new_generators->m[i]);
     j = og_ini;
@@ -341 +341 @@
            (pGetComp(old_generators->m[j])<kk)) j++;
     while ((j<og_elem) && (old_generators->m[j]!=NULL) &&
-           (pFDeg(old_generators->m[j])<=k)) j++;
+           (pFDeg(old_generators->m[j],currRing)<=k)) j++;
     for (jj=og_elem;jj>j;jj--)
     {
@@ -440 +440 @@
         tso.lcm = prs[jj];
         prs[jj] = NULL;
-        tso.order = pFDeg(tso.lcm);
+        tso.order = pFDeg(tso.lcm,currRing);
         tso.p1 = old_generators->m[jj];
         tso.p2 = old_generators->m[j];
@@ -679 +679 @@
     {
 /*--- tests wether a generator must be replaced (lt(f1)|lt(f2)!)--*/
-      if (pFDeg(tso.p1)==pFDeg(tso.lcm))
+      if (pFDeg(tso.p1,currRing)==pFDeg(tso.lcm,currRing))
         toReplace = tso.ind1+1;
-      else if (pFDeg(tso.p2)==pFDeg(tso.lcm))
+      else if (pFDeg(tso.p2,currRing)==pFDeg(tso.lcm,currRing))
         toReplace = tso.ind2+1;
     }
@@ -687 +687 @@
 /*--- tests wether the product criterion applies --------------*/
     if ((index==0) && (old_generators->rank==1) && 
-        (pFDeg(tso.p1)+pFDeg(tso.p2)==tso.order))
+        (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order))
     {
       tso.p = NULL;
@@ -1139 +1139 @@
         tso.lcm = prs[j];
         prs[j] = NULL;
-        tso.order = pFDeg(tso.lcm);
+        tso.order = pFDeg(tso.lcm,currRing);
         tso.p1 = add_generators->m[j];
         tso.p2 = add_generators->m[i];
@@ -1198 +1198 @@
       PrintS(".");
 #ifdef USE_PROD_CRIT
-    if (pFDeg(tso.p1)+pFDeg(tso.p2)==tso.order+pFDeg(deg_soc))
+    if (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order+pFDeg(deg_soc,currRing))
     {
       if (TEST_OPT_PROT) PrintS("pc");
@@ -1423 +1423 @@
   while ((next_place_add>0) && (add_generators->m[next_place_add-1]==NULL))
     next_place_add--;
-  int next_deg = pFDeg(temp_generators->m[i]);
+  int next_deg = pFDeg(temp_generators->m[i],currRing);
   next_new_el = next_place_add;
 /*--- loop about all all elements-----------------------------------*/
@@ -1443 +1443 @@
     }
 #endif
-    while ((i<idel_temp) && (pFDeg(temp_generators->m[i])==next_deg))
+    while ((i<idel_temp) && (pFDeg(temp_generators->m[i],currRing)==next_deg))
     {
       next_p = temp_generators->m[i];
@@ -1504 +1504 @@
     red_deg = next_deg;
     if (i<idel_temp)
-      next_deg = pFDeg(temp_generators->m[i]);
+      next_deg = pFDeg(temp_generators->m[i],currRing);
     else
       next_deg = -1;
@@ -1608 +1608 @@
       p = new_generators->m[j];
       new_generators->m[j] = NULL;
-      deg_p = pFDeg(p);
+      deg_p = pFDeg(p,currRing);
       if (min_deg<0)
       {
@@ -1619 +1619 @@
       k = 0;
       while ((k<idel_temp) && (temp_generators->m[k]!=NULL) &&
-             (pFDeg(temp_generators->m[k])<=deg_p)) k++;
+             (pFDeg(temp_generators->m[k],currRing)<=deg_p)) k++;
       for (jj=idel_temp-1;jj>k;jj--)
       {
@@ -1787 +1787 @@
   if (temp->m[0]!=NULL)
   {
-    int maxdeg=pFDeg(temp->m[IDELEMS(temp)-1]),md;
+    int md;
+    int maxdeg=pFDeg(temp->m[IDELEMS(temp)-1],currRing);
     ideal temp1=idInit(IDELEMS(temp),temp->rank);
     for (j=IDELEMS(temp)-2;j>=0;j--)
     {
-      jj = pFDeg(temp->m[j]);
+      jj = pFDeg(temp->m[j],currRing);
       if (jj>maxdeg) maxdeg = jj;
     }
@@ -1801 +1802 @@
         if (temp->m[j]!=NULL)
         {
-          jj = pFDeg(temp->m[j]);
+          jj = pFDeg(temp->m[j],currRing);
           if (jj<md) md = jj;
         }
@@ -1807 +1808 @@
       for (j=0;j<IDELEMS(temp);j++)
       {
-        if ((temp->m[j]!=NULL) && (pFDeg(temp->m[j])==md))
+        if ((temp->m[j]!=NULL) && (pFDeg(temp->m[j],currRing)==md))
         {
           temp1->m[k] = temp->m[j];
@@ -1845 +1846 @@
       if (!nIsOne(pGetCoeff(new_generators->m[0])))
         pNorm(new_generators->m[0]);
-      next_deg = pFDeg(new_generators->m[0]);
+      next_deg = pFDeg(new_generators->m[0],currRing);
       next_gen = pCopy(new_generators->m[0]);
     }
@@ -1990 +1991 @@
           {
             PrintS("Da ist was faul!!!\n");
-            Print("Aber: Regularitaet %d, Grad %d\n",syzstr->regularity,pFDeg(totake[index]->m[i]));
+            Print("Aber: Regularitaet %d, Grad %d\n",
+                   syzstr->regularity,pFDeg(totake[index]->m[i],currRing));
           }
         }