Changeset a0d9be in git

Timestamp:

Jun 10, 2010, 2:54:59 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

6e0750067834212a8910aad022e669ca646b5786

Parents:

407ff05c12f210a6f1d860dac19e7850c61d38ea

Message:

pCleardenom -> p_Cleardenom,
pCleardenom_n -> p_Cleardenom_n,
pContent -> p_Content



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

Location:

kernel

Files:

• clapsing.cc (modified) (9 diffs)
• fglmcomb.cc (modified) (1 diff)
• gr_kstd2.cc (modified) (14 diffs)
• gring.cc (modified) (6 diffs)
• kInline.cc (modified) (4 diffs)
• kstdfac.cc (modified) (1 diff)
• kutil.cc (modified) (3 diffs)
• polys.h (modified) (1 diff)
• polys1.cc (modified) (16 diffs)
• rintegers.cc (modified) (1 diff)
• sca.cc (modified) (9 diffs)
• sparsmat.cc (modified) (1 diff)
• syz.cc (modified) (2 diffs)
• tgb.cc (modified) (13 diffs)

kernel/clapsing.cc

@@ -28 +28 @@
 poly singclap_gcd_r ( poly f, poly g, const ring r )
 {
-  // assume pCleardenom is done
+  // assume p_Cleardenom is done
   // assume f!=0, g!=0
   poly res=NULL;
@@ -102 +102 @@
   poly res=NULL;
 
-  if (f!=NULL) pCleardenom(f);
-  if (g!=NULL) pCleardenom(g);
-  else         return f; // g==0 => gcd=f (but do a pCleardenom)
-  if (f==NULL) return g; // f==0 => gcd=g (but do a pCleardenom)
+  if (f!=NULL) p_Cleardenom(f, currRing);
+  if (g!=NULL) p_Cleardenom(g, currRing);
+  else         return f; // g==0 => gcd=f (but do a p_Cleardenom)
+  if (f==NULL) return g; // f==0 => gcd=g (but do a p_Cleardenom)
 
   res=singclap_gcd_r(f,g,currRing);
@@ -169 +169 @@
       //Variable X(i+rPar(currRing));
       number nf,ng;
-      pCleardenom_n(f,nf);pCleardenom_n(g,ng);
+      p_Cleardenom_n(f, currRing,nf);p_Cleardenom_n(g, currRing,ng);
       int ef,eg;
       ef=pGetExp_Var(f,i);
@@ -797 +797 @@
       if (with_exps==0)
         N=nCopy(n0);
-      pCleardenom(f);
+      p_Cleardenom(f, currRing);
       NN=nDiv(n0,pGetCoeff(f));
       nDelete(&n0);
@@ -816 +816 @@
         N=nCopy(n0);
       pNorm(f);
-      pCleardenom(f);
+      p_Cleardenom(f, currRing);
       NN=nDiv(n0,pGetCoeff(f));
       nDelete(&n0);
@@ -1170 +1170 @@
     //if (f!=NULL) // already tested at start of routine
     {
-      pCleardenom(f);
+      p_Cleardenom(f, currRing);
     }
   }
@@ -1179 +1179 @@
     {
       pNorm(f);
-      pCleardenom(f);
+      p_Cleardenom(f, currRing);
     }
   }
@@ -1290 +1290 @@
       {
         p=pCopy(p);
-        pCleardenom(p);
+        p_Cleardenom(p, currRing);
         L.append(convSingPFactoryP(p));
       }
@@ -1307 +1307 @@
       {
         p=pCopy(p);
-        pCleardenom(p);
+        p_Cleardenom(p, currRing);
         L.append(convSingTrPFactoryP(p));
       }

kernel/fglmcomb.cc

@@ -377 +377 @@
             }
         }
-        pContent( result );
+        p_Content( result, currRing );
         if ( ! nGreaterZero( pGetCoeff( result ) ) ) result= pNeg( result );
     }

kernel/gr_kstd2.cc

@@ -102 +102 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        if (rField_is_Zp_a()) pContent(h->p);
-        else h->pCleardenom();// also does a pContent
+        if (rField_is_Zp_a()) p_Content(h->p,currRing);
+        else h->pCleardenom();// also does a p_Content
       }
       /*computes the ecart*/
@@ -232 +232 @@
   if (!TEST_OPT_INTSTRATEGY)
   {
-    if (rField_is_Zp_a()) pContent(h->p);
+    if (rField_is_Zp_a()) p_Content(h->p,currRing);
     else h->pCleardenom();// also does a pContentRat
   }
@@ -269 +269 @@
         if (!TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
 
@@ -468 +468 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
           else h->pCleardenom();// also does a pContent
         }
@@ -492 +492 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
 /*
@@ -553 +553 @@
 //        {
 //          if (TEST_OPT_DEBUG) PrintS(" > syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          enterTBba((*h),strat->tl+1,strat);
 //          return;
@@ -568 +568 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          pContent(h->p);
-          //pCleardenom(h->p);// also does a pContent
+          p_Content(h->p,currRing);
+          //pCleardenom(h->p);// also does a p_Content
         }
       }
@@ -612 +612 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (rField_is_Zp_a()) pContent(h->p);
-          else h->pCleardenom();// also does a pContent
+          if (rField_is_Zp_a()) p_Content(h->p,currRing);
+          else h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -729 +729 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        //pContent(h->p);
-        h->pCleardenom();// also does a pContent
+        h->pCleardenom();// also does a p_Content
       }
       /* compute the ecart */
@@ -743 +742 @@
 //          if (TEST_OPT_DEBUG)
 //            PrintS("  >syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          at=strat->posInT(strat->T,strat->tl,(*h));
 //          enterTBba((*h),at,strat);
@@ -795 +794 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          //pContent(h->p);
-          h->pCleardenom();// also does a pContent
+          h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -913 +911 @@
 //          if (TEST_OPT_DEBUG)
 //            PrintS(" >syzComp\n");
-//          if (TEST_OPT_INTSTRATEGY) pContent(h->p);
+//          if (TEST_OPT_INTSTRATEGY) p_Content(h->p,currRing);
 //          at=strat->posInT(strat->T,strat->tl,(*h));
 //          enterTBba((*h),at,strat);
@@ -950 +948 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          //pContent(h->p);
-          h->pCleardenom();// also does a pContent
+          h->pCleardenom();// also does a p_Content
         }
         enterT((*h),strat);
@@ -1218 +1215 @@
             }
 
-            strat->P.p=pCleardenom(strat->P.p);
+            strat->P.p=p_Cleardenom(strat->P.p, currRing);
           }
           else

kernel/gring.cc

@@ -1424 +1424 @@
   out = p_Add_q(p2,N,r);
   p_Test(out,r);
-  if ( out!=NULL ) pContent(out);
+  if ( out!=NULL ) p_Content(out,r);
   p_Delete(&m,r);
   n_Delete(&cF,r);
@@ -1491 +1491 @@
   out = p_Add_q(p2,N,r); // delete N, p2
   p_Test(out,r);
-  if ( out!=NULL ) pContent(out);
+  if ( out!=NULL ) p_Content(out,r);
   return(out);
 }
@@ -1579 +1579 @@
   p_Test(M2,r);
 #endif
-  if (M2!=NULL) M2=pCleardenom(M2);
-  //if (M2!=NULL) pContent(M2); // done by pCleardenom
+  if (M2!=NULL) M2=p_Cleardenom(M2,r);
+  //if (M2!=NULL) p_Content(M2); // done by pCleardenom
   return(M2);
 }
@@ -1855 +1855 @@
 #endif
 
-  if (M2!=NULL) pCleardenom(M2); //?
-//  if (M2!=NULL) pContent(M2);
+  if (M2!=NULL) p_Cleardenom(M2,r);
+//  if (M2!=NULL) p_Content(M2);
 
   return(M2);
@@ -2080 +2080 @@
     poly pp = nc_mm_Mult_pp(m,p,currRing);
     number c2,cc;
-    pCleardenom_n(pp,c2);
+    p_Cleardenom_n(pp,currRing,c2);
     pDelete(&m);
     ctmp = kBucketPolyRed(b,pp,pLength(pp),NULL);
@@ -2113 +2113 @@
     poly pp = nc_mm_Mult_pp(m,p,currRing);
     number c2,cc;
-    pCleardenom_n(pp,c2);
+    p_Cleardenom_n(pp,currRing,c2);
     pDelete(&m);
     ctmp = kBucketPolyRed(b,pp,pLength(pp),NULL);

kernel/kInline.cc

@@ -423 +423 @@
 {
   assume(p != NULL);
-  #ifdef HAVE_RATGRING
-  p= ::pCleardenom(p);
-  #else
-  ::pCleardenom(p);
-  #endif
   if (t_p != NULL)
-    pSetCoeff0(t_p, pGetCoeff(p));
+  {
+    p_Cleardenom(t_p, tailRing);
+    pSetCoeff0(p, pGetCoeff(t_p));
+  }
+  else
+  {
+    #ifdef HAVE_RATGRING
+    p= p_Cleardenom(p, currRing);
+    #else
+    p_Cleardenom(p, currRing);
+    #endif
+  }
 }
 
@@ -979 +985 @@
 
   int i;
-  long x;
-  long e1;
-  long e2;
-  long s;
+  int x;
+  int e1;
+  int e2;
+  int s;
   m1 = p_Init(tailRing);
   m2 = p_Init(tailRing);
   lcm = p_Init(leadRing);
 
-  int small_index=1;
-  if ((pGetComp(p1)!=0)||(pGetComp(p2)!=0)) small_index=0;
-
-  for (i = leadRing->N; i>=small_index; i--)
+  for (i = leadRing->N; i>=1; i--)
   {
     e1 = p_GetExp(p1,i,leadRing);
@@ -998 +1001 @@
     {
       p_SetExp(m2,i,x, tailRing);
-      p_SetExp(m1,i,0, tailRing);
+      //p_SetExp(m1,i,0, tailRing); // done by p_Init
       s = e1;
     }
@@ -1004 +1007 @@
     {
       p_SetExp(m1,i,-x, tailRing);
-      p_SetExp(m2,i,0, tailRing);
+      //p_SetExp(m2,i,0, tailRing); // done by p_Init
       s = e2;
     }
     p_SetExp(lcm,i,s, leadRing);
   }
+  if ((s=pGetComp(p1))!=0)
+  {
+    p_SetComp(lcm,s, leadRing);
+  } 
+  else if ((s=pGetComp(p2))!=0)
+  {
+    p_SetComp(lcm,s, leadRing);
+  } 
+  // else p_SetComp(lcm,0,tailRing); // done by p_Init
 
   p_Setm(m1, tailRing);

kernel/kstdfac.cc

@@ -331 +331 @@
     if (TEST_OPT_INTSTRATEGY)
     {
-      strat->S[si]=pCleardenom(strat->S[si]);
+      strat->S[si]=p_Cleardenom(strat->S[si], currRing);
     }
     if (TEST_OPT_PROT)

kernel/kutil.cc

@@ -5402 +5402 @@
             {
               //pContent(strat->S[i]);
-              strat->S[i]=pCleardenom(strat->S[i]);// also does a pContent
+              strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
             }
             else
@@ -5471 +5471 @@
             if (TEST_OPT_INTSTRATEGY)
             {
-              strat->S[i]=pCleardenom(strat->S[i]);// also does a pContent
+              strat->S[i]=p_Cleardenom(strat->S[i], currRing);// also does a pContent
             }
             else
@@ -6122 +6122 @@
         strat->S[i] = redtail(strat->S[i], strat->sl, strat);
       if (TEST_OPT_INTSTRATEGY)
-        strat->S[i]=pCleardenom(strat->S[i]);
+        strat->S[i]=p_Cleardenom(strat->S[i], currRing);
     }
     if (TEST_OPT_PROT)

kernel/polys.h

@@ -363 +363 @@
 #define   pOne()   p_One(currRing)
 
-void      pContent(poly p);
+void      p_Content(poly p, const ring r);
 void      pSimpleContent(poly p, int s);
-poly      pCleardenom(poly p);
-void      pCleardenom_n(poly p,number &c);
+poly      p_Cleardenom(poly p, const ring r);
+void      p_Cleardenom_n(poly p, const ring r,number &c);
 void      p_Normalize(poly p,const ring r);
 number    p_GetAllDenom(poly ph, const ring r);

kernel/polys1.cc

@@ -484 +484 @@
 number pInitContent_a(poly ph);
 
-void pContent(poly ph)
+void p_Content(poly ph, const ring r)
 {
 #ifdef HAVE_RINGS
-  if (rField_is_Ring(currRing))
-  {
-    if ((ph!=NULL) && rField_has_Units(currRing))
+  if (rField_is_Ring(r))
+  {
+    if ((ph!=NULL) && rField_has_Units(r))
     {
       number k = nGetUnit(pGetCoeff(ph));
@@ -527 +527 @@
       p=ph;
     }
-    else if ((rField_is_Extension())
-    && ((rPar(currRing)>1)||(currRing->minpoly==NULL)))
+    else if ((rField_is_Extension(r))
+    && ((rPar(r)>1)||(r->minpoly==NULL)))
     {
       h=pInitContent_a(ph);
@@ -541 +541 @@
     {
       nNormalize(pGetCoeff(p));
-      d=nGcd(h,pGetCoeff(p),currRing);
+      d=nGcd(h,pGetCoeff(p),r);
       nDelete(&h);
       h = d;
@@ -578 +578 @@
     }
 #endif
-    if (rField_is_Q_a())
-    {
-      number hzz = nlInit(1, currRing);
-      h = nlInit(1, currRing);
+    if (rField_is_Q_a(r))
+    {
+      number hzz = nlInit(1, r);
+      h = nlInit(1, r);
       p=ph;
       while (p!=NULL)
@@ -589 +589 @@
         while (c_n!=NULL)
         { // each monom: coeff in Q
-          d=nlLcm(hzz,pGetCoeff(c_n),currRing->algring);
-          n_Delete(&hzz,currRing->algring);
+          d=nlLcm(hzz,pGetCoeff(c_n),r->algring);
+          n_Delete(&hzz,r->algring);
           hzz=d;
           pIter(c_n);
@@ -597 +597 @@
         while (c_n!=NULL)
         { // each monom: coeff in Q
-          d=nlLcm(h,pGetCoeff(c_n),currRing->algring);
-          n_Delete(&h,currRing->algring);
+          d=nlLcm(h,pGetCoeff(c_n),r->algring);
+          n_Delete(&h,r->algring);
           h=d;
           pIter(c_n);
@@ -609 +609 @@
       number hzztmp=nlInvers(hzz);
       number hh=nlMult(hzz,h);
-      nlDelete(&hzz,currRing->algring);
-      nlDelete(&h,currRing->algring);
-      number hg=nlGcd(hzztmp,htmp,currRing->algring);
-      nlDelete(&hzztmp,currRing->algring);
-      nlDelete(&htmp,currRing->algring);
+      nlDelete(&hzz,r->algring);
+      nlDelete(&h,r->algring);
+      number hg=nlGcd(hzztmp,htmp,r->algring);
+      nlDelete(&hzztmp,r->algring);
+      nlDelete(&htmp,r->algring);
       h=nlMult(hh,hg);
-      nlDelete(&hg,currRing->algring);
-      nlDelete(&hh,currRing->algring);
+      nlDelete(&hg,r->algring);
+      nlDelete(&hh,r->algring);
       nlNormalize(h);
       if(!nlIsOne(h))
@@ -629 +629 @@
             d=nlMult(h,pGetCoeff(c_n));
             nlNormalize(d);
-            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            nlDelete(&pGetCoeff(c_n),r->algring);
             pGetCoeff(c_n)=d;
             pIter(c_n);
@@ -638 +638 @@
             d=nlMult(h,pGetCoeff(c_n));
             nlNormalize(d);
-            nlDelete(&pGetCoeff(c_n),currRing->algring);
+            nlDelete(&pGetCoeff(c_n),r->algring);
             pGetCoeff(c_n)=d;
             pIter(c_n);
@@ -645 +645 @@
         }
       }
-      nlDelete(&h,currRing->algring);
+      nlDelete(&h,r->algring);
     }
   }
@@ -943 +943 @@
 #endif
 
-poly pCleardenom(poly ph)
+poly p_Cleardenom(poly ph, const ring r)
 {
   poly start=ph;
@@ -950 +950 @@
 
 #ifdef HAVE_RINGS
-  if (rField_is_Ring(currRing))
-  {
-    pContent(ph);
+  if (rField_is_Ring(r))
+  {
+    p_Content(ph,r);
     return start;
   }
 #endif
-  if (rField_is_Zp() && TEST_OPT_INTSTRATEGY) return start;
+  if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY) return start;
   p = ph;
   if(pNext(p)==NULL)
@@ -1055 +1055 @@
     if (h!=NULL) nDelete(&h);
   
-    pContent(ph);
+    p_Content(ph,r);
 #ifdef HAVE_RATGRING
-    if (rIsRatGRing(currRing))
+    if (rIsRatGRing(r))
     {
       /* quick unit detection in the rational case is done in gr_nc_bba */
@@ -1068 +1068 @@
 }
 
-void pCleardenom_n(poly ph,number &c)
+void p_Cleardenom_n(poly ph,const ring r,number &c)
 {
   number d, h;
@@ -1085 +1085 @@
     {
       nNormalize(pGetCoeff(p));
-      d=nLcm(h,pGetCoeff(p),currRing);
+      d=nLcm(h,pGetCoeff(p),r);
       nDelete(&h);
       h=d;
@@ -1121 +1121 @@
           while (p!=NULL)
           {
-            d=nLcm(h,pGetCoeff(p),currRing);
+            d=nLcm(h,pGetCoeff(p),r);
             nDelete(&h);
             h=d;

kernel/rintegers.cc

@@ -161 +161 @@
 BOOLEAN nrzIsOne (number a)
 {
-  return 0 == mpz_cmp_si((int_number) a, 1);
+  return (a!=NULL) && (0 == mpz_cmp_si((int_number) a, 1));
 }
 
 BOOLEAN nrzIsMOne (number a)
 {
-  return 0 == mpz_cmp_si((int_number) a, -1);
+  return (a!=NULL) && (0 == mpz_cmp_si((int_number) a, -1));
 }
 

kernel/sca.cc

@@ -834 +834 @@
   poly spoly = p_Add_q (tmp1, tmp2, r); // spoly = spoly(lt(p1), lt(p2)) + m1 * tail(p1), delete tmp1,2
 
-  if (spoly!=NULL) pCleardenom (spoly); // r?
-//  if (spoly!=NULL) pContent (spoly); // r?
+  if (spoly!=NULL) p_Cleardenom (spoly, r);
+//  if (spoly!=NULL) p_Content (spoly); // r?
 
 #ifdef PDEBUG
@@ -910 +910 @@
   p2 = p_Add_q(p2, T, r);
 
-  if ( p2!=NULL ) pContent(p2); // r?
+  if ( p2!=NULL ) p_Content(p2,r);
 
 #ifdef PDEBUG
@@ -939 +939 @@
     if (TEST_OPT_INTSTRATEGY)
     {
-      pCleardenom(h.p);
+      p_Cleardenom(h.p, currRing);
     }
     else
     {
       pNorm(h.p);
-      pContent(h.p);
+      p_Content(h.p,currRing);
     }
 
@@ -954 +954 @@
       {
 //        pCleardenom(h.p);
-        pContent(h.p);
+        p_Content(h.p,currRing);
       }
       else
@@ -1176 +1176 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-//           h.pCleardenom(); // also does a pContent
-          pContent(h.p);
+//           h.pCleardenom(); // also does a p_Content
+          p_Content(h.p,currRing);
         }
         else
@@ -1768 +1768 @@
 
               if (TEST_OPT_INTSTRATEGY)
-                h.pCleardenom(); // also does a pContent
+                h.pCleardenom(); // also does a p_Content
               else
                 h.pNorm();
@@ -1950 +1950 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-//          pContent(h.p);
-          h.pCleardenom(); // also does a pContent
+//          p_Content(h.p);
+          h.pCleardenom(); // also does a p_Content
         }
         else
@@ -2244 +2244 @@
 
               if (TEST_OPT_INTSTRATEGY)
-                h.pCleardenom(); // also does a pContent
+                h.pCleardenom(); // also does a p_Content
               else
                 h.pNorm();
@@ -2396 +2396 @@
 
         if (TEST_OPT_INTSTRATEGY)
-           h.pCleardenom(); // also does a pContent
+           h.pCleardenom(); // also does a p_Content
         else
           h.pNorm();

kernel/sparsmat.cc

@@ -2505 +2505 @@
     {
       x = nCopy(pGetCoeff(a));
-      pCleardenom(a);
+      p_Cleardenom(a, currRing);
       y = nDiv(x,pGetCoeff(a));
       nDelete(&x);

kernel/syz.cc

@@ -176 +176 @@
       if (TEST_OPT_PROT) PrintS("f");
       actWith = syz->m[i];
-      if (!rField_has_simple_inverse()) pCleardenom(actWith);
+      if (!rField_has_simple_inverse()) p_Cleardenom(actWith, currRing);
 //Print("actWith: ");pWrite(actWith);
       syz->m[i] = NULL;
@@ -242 +242 @@
   if ((till<=0) || (till>IDELEMS(syz))) till = IDELEMS(syz);
   syz->m[elnum] = NULL;
-  if (!rField_has_simple_inverse()) pCleardenom(actWith);
+  if (!rField_has_simple_inverse()) p_Cleardenom(actWith, currRing);
 /*--makes Gauss alg. for the column ModComp--*/
   pTakeOutComp(&(actWith), ModComp, &unit1, &lu);

kernel/tgb.cc

@@ -41 +41 @@
 static omBin lm_bin=NULL;
 
-static void simplify_poly(poly p, ring r) {
+static void simplify_poly(poly p, ring r)
+{
      assume(r==currRing);
      if (!rField_is_Zp(r))
      {
-        pCleardenom(p);
-        pContent(p); //is a duplicate call, but belongs here
+        p_Cleardenom(p,r);
+        //p_Content(p,r); //is a duplicate call, but belongs here
      }
      else
@@ -854 +855 @@
 
 
-static int add_to_reductors(slimgb_alg* c, poly h, int len, int ecart, BOOLEAN simplified){
+static int add_to_reductors(slimgb_alg* c, poly h, int len, int ecart, BOOLEAN simplified)
+{
   //inDebug(h);
   assume(lenS_correct(c->strat));
@@ -869 +871 @@
   P.ecart=ecart;
   P.FDeg=pFDeg(P.p,c->r);
-  if (!(simplified)){
-      if (!rField_is_Zp(c->r)){
-        pCleardenom(P.p);
-        pContent(P.p); //is a duplicate call, but belongs here
+  if (!(simplified))
+  {
+      if (!rField_is_Zp(c->r))
+      {
+        p_Cleardenom(P.p,c->r);
+        //p_Content(P.p,c->r ); //is a duplicate call, but belongs here
 
       }
@@ -1308 +1312 @@
   sorted_pair_node** nodes=(sorted_pair_node**) omalloc(sizeof(sorted_pair_node*)*i);
   int spc=0;
-  if(c->n>c->array_lengths){
+  if(c->n>c->array_lengths)
+  {
     c->array_lengths=c->array_lengths*2;
     assume(c->array_lengths>=c->n);
@@ -1334 +1339 @@
     ENLARGE(c->T_deg_full,int);
   sugar=c->T_deg[i]=c->pTotaldegree(h);
-  if(c->T_deg_full){
+  if(c->T_deg_full)
+  {
     sugar=c->T_deg_full[i]=c->pTotaldegree_full(h);
     ecart=sugar-c->T_deg[i];
@@ -1351 +1357 @@
   //necessary for correct weighted length
 
-   if (!rField_is_Zp(c->r)){
-    pCleardenom(h);
-    pContent(h); //is a duplicate call, but belongs here
+  if (!rField_is_Zp(c->r))
+  {
+    p_Cleardenom(h, c->r);
+    //p_Content(h,c->r); //is a duplicate call, but belongs here
 
   }
@@ -2478 +2485 @@
     {
 #ifdef HAVE_PLURAL
-      if (c->nc){
+      if (c->nc)
+      {
         h= nc_CreateSpoly(c->S->m[s->i], c->S->m[s->j]/*, NULL*/, c->r);
 
         if (h!=NULL)
-          pCleardenom(h);
+          p_Cleardenom(h, c->r);
       }
       else
@@ -2838 +2846 @@
         p_Test(p,r);
         si->deg=this->pTotaldegree_full(p);
-        /*if (!rField_is_Zp(r)){
-          pContent(p);
-          pCleardenom(p);
+        /*if (!rField_is_Zp(r))
+       {
+          p_Content(p,r);
+          p_Cleardenom(p,r);
         }*/
 
@@ -3002 +3011 @@
       si->expected_length=pQuality(I->m[i],this,pLength(I->m[i]));
       si->deg=pTotaldegree(I->m[i]);
-      if (!rField_is_Zp(r)){
-        pCleardenom(I->m[i]);
+      if (!rField_is_Zp(r))
+      {
+        p_Cleardenom(I->m[i], r);
       }
       si->lcm_of_lm=I->m[i];
@@ -3457 +3467 @@
           if (!rField_is_Zp(r))
           {
-            pCleardenom(h);
-            pContent(h);
-
-          } else pNorm(h);
+            p_Cleardenom(h,r);
+            //p_Content(h,r);
+
+          }
+          else pNorm(h);
           //TODO:GCD of TERMS
           poly got=::gcd_of_terms(h,r);
@@ -3965 +3976 @@
     if (!rField_is_Zp(c->r))
     {
-      pCleardenom(clear_into);//should be unnecessary
-      pContent(clear_into);
-
+      p_Cleardenom(clear_into,c->r);//should be unnecessary
+      //p_Content(clear_into, c->r);
     }
     else
@@ -4371 +4381 @@
         if (!c->nc)
             p=redTailShort(p, c->strat);
-        pCleardenom(p);
-        pContent(p);
+        p_Cleardenom(p, c->r);
+        p_Content(p, c->r);
       }
       si->expected_length=pQuality(p,c,pLength(p));
@@ -4484 +4494 @@
     if (!rField_is_Zp(c->r))
     {
-      pCleardenom(red);//should be unnecessary
-      pContent(red);
-
-
+      p_Cleardenom(red, c->r);//should be unnecessary
+      //p_Content(red, c->r);
     }
     pNormalize(red);
-    if (c->eliminationProblem){
+    if (c->eliminationProblem)
+    {
         r[rn].sugar=c->pTotaldegree_full(red);
     }
 
-    if ((!(erg.fromS))&&(TEST_V_UPTORADICAL)){
-
+    if ((!(erg.fromS))&&(TEST_V_UPTORADICAL))
+    {
          if (polynomial_root(red,c->r))
             lt_changed=TRUE;
-            sev=p_GetShortExpVector(red,c->r);}
+            sev=p_GetShortExpVector(red,c->r);
+    }
     red_len=pLength(red);
   }