Changeset 06abb07 in git for libpolys/polys

Timestamp:

Sep 19, 2016, 2:23:44 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

59dca7d44c6d942796166db1c0ac9621d2a5ee39

Parents:

c4ead28a352d5f3846b80a454f239a0ef2b5af5a

Message:

chg: n_...(...,ring) -> n_....(...,coeff) for better debugging

Location:

libpolys/polys

Files:

• monomials/p_polys.cc (modified) (5 diffs)
• nc/ncSAFormula.cc (modified) (18 diffs)
• nc/ncSAMult.h (modified) (1 diff)
• nc/old.gring.cc (modified) (43 diffs)
• nc/sca.cc (modified) (12 diffs)
• sparsmat.cc (modified) (2 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -124 +124 @@
       }
       else
-        x[j]=n_Init(0, R);
+        x[j]=n_Init(0, R->cf);
     }
     number n=n_ChineseRemainderSym(x,q,rl,TRUE,inv_cache,R->cf);
@@ -131 +131 @@
       x[j]=NULL; // n_Init(0...) takes no memory
     }
-    if (n_IsZero(n,R)) p_Delete(&h,R);
+    if (n_IsZero(n,R->cf)) p_Delete(&h,R);
     else
     {
@@ -2541 +2541 @@
   }
   else
-    s=n_Size(d,r);
+    s=n_Size(d,r->cf);
   number d2=d;
   loop
@@ -2571 +2571 @@
     else
     {
-      int ns=n_Size(pGetCoeff(ph),r);
+      int ns=n_Size(pGetCoeff(ph),r->cf);
       if (ns<=3)
       {
@@ -4399 +4399 @@
   if (rField_is_Ring(r))
   {
-    if (!n_DivBy(p_GetCoeff(p1, r), p_GetCoeff(p2, r), r)) return FALSE;
+    if (!n_DivBy(pGetCoeff(p1), pGetCoeff(p2), r->cf)) return FALSE;
   }
   #endif
-  n=n_Div(p_GetCoeff(p1,r),p_GetCoeff(p2,r),r);
+  n=n_Div(pGetCoeff(p1),pGetCoeff(p2),r->cf);
   while ((p1 != NULL) /*&& (p2 != NULL)*/)
   {
     if ( ! p_LmEqual(p1, p2,r))
     {
-        n_Delete(&n, r);
+        n_Delete(&n, r->cf);
         return FALSE;
     }
-    if (!n_Equal(p_GetCoeff(p1, r), nn = n_Mult(p_GetCoeff(p2, r),n, r->cf), r->cf))
-    {
-      n_Delete(&n, r);
-      n_Delete(&nn, r);
+    if (!n_Equal(pGetCoeff(p1), nn = n_Mult(pGetCoeff(p2),n, r->cf), r->cf))
+    {
+      n_Delete(&n, r->cf);
+      n_Delete(&nn, r->cf);
       return FALSE;
     }
-    n_Delete(&nn, r);
+    n_Delete(&nn, r->cf);
     pIter(p1);
     pIter(p2);
   }
-  n_Delete(&n, r);
+  n_Delete(&n, r->cf);
   return TRUE;
 }

libpolys/polys/nc/ncSAFormula.cc

@@ -117 +117 @@
     const number q = p_GetCoeff(GetC(r, i, j), r);
 
-    if( !n_IsOne(q, r) )
+    if( !n_IsOne(q, r->cf) )
       return FALSE;
   }
@@ -146 +146 @@
 
   const poly c = GetC(r, i, j);
-  const number q = p_GetCoeff(c, r);
+  const number q = pGetCoeff(c);
   const poly d = GetD(r, i, j);
 
@@ -159 +159 @@
   {
 
-    if( n_IsOne(q, r) ) // commutative
+    if( n_IsOne(q, r->cf) ) // commutative
       return _ncSA_1xy0x0y0;
 
-    if( n_IsMOne(q, r) ) // anti-commutative
+    if( n_IsMOne(q, r->cf) ) // anti-commutative
       return _ncSA_Mxy0x0y0;
 
@@ -168 +168 @@
   } else
   {
-    if( n_IsOne(q, r) ) // "Lie" case
+    if( n_IsOne(q, r->cf) ) // "Lie" case
     {
       if( pNext(d) == NULL ) // Our Main Special Case: d is only a term!
@@ -194 +194 @@
             if (AreCommutingVariables(r, k, i/*, &qi*/) && AreCommutingVariables(r, k, j/*, &qj*/) ) // [x, t] = [Dx, t] = 0?
             {
-              const number g = p_GetCoeff(d, r);
-
-              if (n_IsOne(g, r))
+              const number g = pGetCoeff(d);
+
+              if (n_IsOne(g, r->cf))
                 return _ncSA_1xy0x0yT2; // save k!?, G = LC(d) == qi == qj == 1!!!
             }
@@ -306 +306 @@
     min = n;
     max = m;
-  } else
+  }
+  else
   {
     min = m;
@@ -315 +316 @@
 
   if( max == 1 )
-    qN = n_Copy(m_q, r);
+    qN = n_Copy(m_q, r->cf);
   else
   {
     number t;
-    n_Power(m_q, max, &t, r);
+    n_Power(m_q, max, &t, r->cf);
 
     if( min > 1 )
     {
-      n_Power(t, min, &qN, r);
-      n_Delete(&t, r);
+      n_Power(t, min, &qN, r->cf);
+      n_Delete(&t, r->cf);
     }
     else
@@ -346 +347 @@
 #if OUTPUT
   Print("ncSA_1xy0x0yG(var(%d)^{%d}, var(%d)^{%d}, G, r)!\n", j, m, i, n);
-  number t = n_Copy(m_g, r);
-  PrintS("Parameter G: "); n_Write(t, r);
-  n_Delete(&t, r);
+  number t = n_Copy(m_g, r->cf);
+  PrintS("Parameter G: "); n_Write(t, r->cf);
+  n_Delete(&t, r->cf);
 #endif
 
@@ -354 +355 @@
   int km = m;
 
-  number c = n_Init(1, r);
+  number c = n_Init(1, r->cf);
 
   poly p = p_One( r);
@@ -373 +374 @@
   for(; k < min; k++ )
   {
-    number t = n_Init(km + 1, r);
-    n_InpMult(t, m_g, r); // t = ((m - k) + 1) * gamma
-    n_InpMult(c, t, r);   // c = c'* ((m - k) + 1) * gamma
-    n_Delete(&t, r);
-
-    t = n_Init(kn + 1, r);
-    n_InpMult(c, t, r);   // c = (c'* ((m - k) + 1) * gamma) * ((n - k) + 1)
-    n_Delete(&t, r);
-
-    t = n_Init(k, r);
-    c = n_Div(c, t, r);
-    n_Delete(&t, r);
-
-//    n_Normalize(c, r);
-
-    t = n_Copy(c, r); // not the last!
+    number t = n_Init(km + 1, r->cf);
+    n_InpMult(t, m_g, r->cf); // t = ((m - k) + 1) * gamma
+    n_InpMult(c, t, r->cf);   // c = c'* ((m - k) + 1) * gamma
+    n_Delete(&t, r->cf);
+
+    t = n_Init(kn + 1, r->cf);
+    n_InpMult(c, t, r->cf);   // c = (c'* ((m - k) + 1) * gamma) * ((n - k) + 1)
+    n_Delete(&t, r->cf);
+
+    t = n_Init(k, r->cf);
+    c = n_Div(c, t, r->cf);
+    n_Delete(&t, r->cf);
+
+//    n_Normalize(c, r->cf);
+
+    t = n_Copy(c, r->cf); // not the last!
 
     p = p_NSet(t, r);
@@ -405 +406 @@
 
   {
-    n_InpMult(c, m_g, r);   // c = c'* gamma
+    n_InpMult(c, m_g, r->cf);   // c = c'* gamma
 
     if( km > 0 )
     {
-      number t = n_Init(km + 1, r);
-      n_InpMult(c, t, r);   // c = (c'* gamma) * (m - k + 1)
-      n_Delete(&t, r);
+      number t = n_Init(km + 1, r->cf);
+      n_InpMult(c, t, r->cf);   // c = (c'* gamma) * (m - k + 1)
+      n_Delete(&t, r->cf);
     }
 
     if( kn > 0 )
     {
-      number t = n_Init(kn + 1, r);
-      n_InpMult(c, t, r);   // c = (c'* gamma) * (n - k + 1)
-      n_Delete(&t, r);
+      number t = n_Init(kn + 1, r->cf);
+      n_InpMult(c, t, r->cf);   // c = (c'* gamma) * (n - k + 1)
+      n_Delete(&t, r->cf);
     }
 
-    number t = n_Init(k, r); // c = ((c'* gamma) * ((n - k + 1) * (m - k + 1))) / k;
-    c = n_Div(c, t, r);
-    n_Delete(&t, r);
+    number t = n_Init(k, r->cf); // c = ((c'* gamma) * ((n - k + 1) * (m - k + 1))) / k;
+    c = n_Div(c, t, r->cf);
+    n_Delete(&t, r->cf);
   }
 
@@ -451 +452 @@
 
   // k == 0!
-  number c = n_Init(1, r);
+  number c = n_Init(1, r->cf);
 
   poly p = p_One( r );
@@ -471 +472 @@
   for(; k < min; k++ )
   {
-    number t = n_Init(km + 1, r);
-//    n_InpMult(t, m_g, r); // t = ((m - k) + 1) * gamma
-    n_InpMult(c, t, r);   // c = c'* ((m - k) + 1) * gamma
-    n_Delete(&t, r);
-
-    t = n_Init(kn + 1, r);
-    n_InpMult(c, t, r);   // c = (c'* ((m - k) + 1) * gamma) * ((n - k) + 1)
-    n_Delete(&t, r);
-
-    t = n_Init(k, r);
-    c = n_Div(c, t, r);
-    n_Delete(&t, r);
+    number t = n_Init(km + 1, r->cf);
+//    n_InpMult(t, m_g, r->cf); // t = ((m - k) + 1) * gamma
+    n_InpMult(c, t, r->cf);   // c = c'* ((m - k) + 1) * gamma
+    n_Delete(&t, r->cf);
+
+    t = n_Init(kn + 1, r->cf);
+    n_InpMult(c, t, r->cf);   // c = (c'* ((m - k) + 1) * gamma) * ((n - k) + 1)
+    n_Delete(&t, r->cf);
+
+    t = n_Init(k, r->cf);
+    c = n_Div(c, t, r->cf);
+    n_Delete(&t, r->cf);
 
 // //    n_Normalize(c, r);
 
-    t = n_Copy(c, r); // not the last!
+    t = n_Copy(c, r->cf); // not the last!
 
     p = p_NSet(t, r);
@@ -509 +510 @@
     if( km > 0 )
     {
-      number t = n_Init(km + 1, r);
-      n_InpMult(c, t, r);   // c = (c'* gamma) * (m - k + 1)
-      n_Delete(&t, r);
+      number t = n_Init(km + 1, r->cf);
+      n_InpMult(c, t, r->cf);   // c = (c'* gamma) * (m - k + 1)
+      n_Delete(&t, r->cf);
     }
 
     if( kn > 0 )
     {
-      number t = n_Init(kn + 1, r);
-      n_InpMult(c, t, r);   // c = (c'* gamma) * (n - k + 1)
-      n_Delete(&t, r);
+      number t = n_Init(kn + 1, r->cf);
+      n_InpMult(c, t, r->cf);   // c = (c'* gamma) * (n - k + 1)
+      n_Delete(&t, r->cf);
     }
 
-    number t = n_Init(k, r); // c = ((c'* gamma) * ((n - k + 1) * (m - k + 1))) / k;
-    c = n_Div(c, t, r);
-    n_Delete(&t, r);
+    number t = n_Init(k, r->cf); // c = ((c'* gamma) * ((n - k + 1) * (m - k + 1))) / k;
+    c = n_Div(c, t, r->cf);
+    n_Delete(&t, r->cf);
   }
 
@@ -552 +553 @@
   int k = m; // to 0
 
-  number c = n_Init(1, r); // k = m, C_k = 1
+  number c = n_Init(1, r->cf); // k = m, C_k = 1
   poly p = p_One( r);
 
@@ -564 +565 @@
   poly pLast = p;
 
-  number nn =  n_Init(n, r); // number(n)!
-  n_InpMult(nn, m_shiftCoef, r); // nn = (alpha*n)
+  number nn =  n_Init(n, r->cf); // number(n)!
+  n_InpMult(nn, m_shiftCoef, r->cf); // nn = (alpha*n)
 
   --k;
@@ -573 +574 @@
   for(; k > 0; k-- )
   {
-    number t = n_Init(k + 1, r);  // t = k+1
-    n_InpMult(c, t, r);           // c = c' * (k+1)
-    n_InpMult(c, nn, r);          // c = (c' * (k+1)) * (alpha * n)
-
-    n_Delete(&t, r);
-    t = n_Init(mk++, r);
-    c = n_Div(c, t, r);           // c = ((c' * (k+1))  * (alpha * n)) / (m-k);
-    n_Delete(&t, r);
-
-//    n_Normalize(c, r);
-
-    t = n_Copy(c, r); // not the last!
+    number t = n_Init(k + 1, r->cf);  // t = k+1
+    n_InpMult(c, t, r->cf);           // c = c' * (k+1)
+    n_InpMult(c, nn, r->cf);          // c = (c' * (k+1)) * (alpha * n)
+
+    n_Delete(&t, r->cf);
+    t = n_Init(mk++, r->cf);
+    c = n_Div(c, t, r->cf);           // c = ((c' * (k+1))  * (alpha * n)) / (m-k);
+    n_Delete(&t, r->cf);
+
+//    n_Normalize(c, r->cf);
+
+    t = n_Copy(c, r->cf); // not the last!
 
     p = p_NSet(t, r);
@@ -600 +601 @@
 
   {
-    n_InpMult(c, nn, r);          // c = (c' * (0+1)) * (alpha * n)
-
-    number t = n_Init(m, r);
-    c = n_Div(c, t, r);           // c = ((c' * (0+1))  * (alpha * n)) / (m-0);
-    n_Delete(&t, r);
-  }
-
-  n_Delete(&nn, r);
+    n_InpMult(c, nn, r->cf);          // c = (c' * (0+1)) * (alpha * n)
+
+    number t = n_Init(m, r->cf);
+    c = n_Div(c, t, r->cf);           // c = ((c' * (0+1))  * (alpha * n)) / (m-0);
+    n_Delete(&t, r->cf);
+  }
+
+  n_Delete(&nn, r->cf);
 
   p = p_NSet(c, r);

libpolys/polys/nc/ncSAMult.h

@@ -45 +45 @@
     {
       poly pMonom = p_LmInit(pTerm, r);
-      pSetCoeff0(pMonom, n_Init(i, r));
+      pSetCoeff0(pMonom, n_Init(i, r->cf));
       return pMonom;
     }

libpolys/polys/nc/old.gring.cc

@@ -63 +63 @@
 // #endif
 
-static poly NF_Proc_Dummy(ideal, ideal, poly, int, int, const ring _currRing)
+static poly NF_Proc_Dummy(ideal, ideal, poly, int, int, const ring)
 { WerrorS("nc_NF not defined"); return NULL; }
-static ideal BBA_Proc_Dummy (const ideal, const ideal, const intvec *, const intvec *, kStrategy strat, const ring)
+static ideal BBA_Proc_Dummy (const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring)
 { WerrorS("nc_NF not defined"); return NULL; }
 
@@ -424 +424 @@
     }
     p_GetExpV(p,P,r);
-    cP=p_GetCoeff(p,r);
-    cOut=n_Mult(cP,cM,r);
+    cP=pGetCoeff(p);
+    cOut=n_Mult(cP,cM,r->cf);
     if (side==1)
     {
@@ -435 +435 @@
     }
     v = p_Mult_nn(v,cOut,r);
-    n_Delete(&cOut,r);
+    n_Delete(&cOut,r->cf);
     p_SetCompP(v,expOut,r);
 
@@ -518 +518 @@
   }
 
-  number cff=n_Init(1,r);
+  number cff=n_Init(1,r->cf);
   number tmp_num=NULL;
   int cpower=0;
@@ -540 +540 @@
         }
       }
-      cff = n_Copy(p_GetCoeff(MATELEM(r->GetNC()->COM,1,2),r),r);
-      n_Power(cff,tpower,&tmp_num, r);
-      n_Delete(&cff,r);
+      cff = n_Copy(pGetCoeff(MATELEM(r->GetNC()->COM,1,2)),r->cf);
+      n_Power(cff,tpower,&tmp_num, r->cf);
+      n_Delete(&cff,r->cf);
       cff = tmp_num;
     }
     else /* skew commutative with nonequal coeffs */
     {
-      number totcff=n_Init(1,r);
+      number totcff=n_Init(1,r->cf);
       for(j=jG; j<=iG; j++)
       {
@@ -558 +558 @@
             {
               cpower = F[i]*G[j]; // bug! overflow danger!!!
-              cff = n_Copy(p_GetCoeff(MATELEM(r->GetNC()->COM,j,i),r),r);
-              n_Power(cff,cpower,&tmp_num, r);
-              cff = n_Mult(totcff,tmp_num, r);
-              n_Delete(&totcff, r);
-              n_Delete(&tmp_num, r);
-              totcff = n_Copy(cff,r);
-              n_Delete(&cff,r);
+              cff = n_Copy(pGetCoeff(MATELEM(r->GetNC()->COM,j,i)),r->cf);
+              n_Power(cff,cpower,&tmp_num, r->cf);
+              cff = n_Mult(totcff,tmp_num, r->cf);
+              n_Delete(&totcff, r->cf);
+              n_Delete(&tmp_num, r->cf);
+              totcff = n_Copy(cff,r->cf);
+              n_Delete(&cff,r->cf);
             }
           } /* end 2nd for */
@@ -633 +633 @@
   poly Rout=NULL;
   number *c=(number *)omAlloc0((rN+1)*sizeof(number));
-  c[0]=n_Init(1,r);
+  c[0]=n_Init(1,r->cf);
 
   int *Op=Nxt;
@@ -654 +654 @@
 
      w=gnc_mm_Mult_uu(Op,t,On[t],r);
-     c[cnt]=n_Mult(c[cnt-1],p_GetCoeff(w,r),r);
+     c[cnt]=n_Mult(c[cnt-1],pGetCoeff(w),r->cf);
      D = pNext(w);  /* getting coef and rest D */
      p_LmDelete(&w,r);
@@ -869 +869 @@
   poly Rout=NULL;
   number *c=(number *)omAlloc0((cnt+2)*sizeof(number));
-  c[cnt+1]=n_Init(1,r);
+  c[cnt+1]=n_Init(1,r->cf);
   i=cnt+2;         /* later in freeN */
   int *Op=Nxt;
@@ -898 +898 @@
 
      poly w=gnc_uu_Mult_ww(t,Op[t],jG,bG,r);
-     c[cnt]=n_Copy(p_GetCoeff(w,r),r);
+     c[cnt]=n_Copy(pGetCoeff(w),r->cf);
      D = pNext(w);  /* getting coef and rest D */
      p_LmDelete(&w,r);
@@ -943 +943 @@
 #endif
      p_Delete(&Pp,r);
-     num=n_Mult(c[cnt+1],c[cnt],r);
-     n_Delete(&c[cnt],r);
+     num=n_Mult(c[cnt+1],c[cnt],r->cf);
+     n_Delete(&c[cnt],r->cf);
      c[cnt]=num;
      Rout=p_Mult_nn(Rout,c[cnt+1],r); /* Rest is ready */
@@ -1119 +1119 @@
     p_AddExp(out,j,b,r);
     p_Setm(out,r);
-    if (n_IsOne(p_GetCoeff(MATELEM(r->GetNC()->COM,j,i),r),r)) /* commutative case */
+    if (n_IsOne(pGetCoeff(MATELEM(r->GetNC()->COM,j,i)),r->cf)) /* commutative case */
     {
       return(out);
@@ -1125 +1125 @@
     else
     {
-      number tmp_number=p_GetCoeff(MATELEM(r->GetNC()->COM,j,i),r); /* quasicommutative case */
-      n_Power(tmp_number,a*b,&tmp_number, r); // BUG! ;-(
+      number tmp_number=pGetCoeff(MATELEM(r->GetNC()->COM,j,i)); /* quasicommutative case */
+      n_Power(tmp_number,a*b,&tmp_number, r->cf); // BUG! ;-(
       p_SetCoeff(out,tmp_number,r);
       return(out);
@@ -1424 +1424 @@
   /* GCD stuff */
   number cG = n_SubringGcd(C, cF, r->cf);
-  if ( !n_IsOne(cG,r) )
-  {
-    cF = n_Div(cF, cG, r); n_Normalize(cF, r);
-    C  = n_Div(C,  cG, r); n_Normalize(C, r);
+  if ( !n_IsOne(cG,r->cf) )
+  {
+    cF = n_Div(cF, cG, r->cf); n_Normalize(cF, r->cf);
+    C  = n_Div(C,  cG, r->cf); n_Normalize(C, r->cf);
   }
   else
   {
-    cF = n_Copy(cF, r);
-    C  = n_Copy(C, r);
-  }
-  n_Delete(&cG,r);
+    cF = n_Copy(cF, r->cf);
+    C  = n_Copy(C, r->cf);
+  }
+  n_Delete(&cG,r->cf);
   p2 = p_Mult_nn(p2, C, r);
   poly out = nc_mm_Mult_pp(m, pNext(p1), r);
@@ -1440 +1440 @@
   p_Test(p2,r);
   p_Test(N,r);
-  if (!n_IsMOne(cF,r))
-  {
-    cF = n_InpNeg(cF,r);
+  if (!n_IsMOne(cF,r->cf))
+  {
+    cF = n_InpNeg(cF,r->cf);
     N  = p_Mult_nn(N, cF, r);
     p_Test(N,r);
@@ -1450 +1450 @@
   if ( out!=NULL ) p_Content(out,r);
   p_Delete(&m,r);
-  n_Delete(&cF,r);
-  n_Delete(&C,r);
+  n_Delete(&cF,r->cf);
+  n_Delete(&C,r->cf);
   return(out);
 }
@@ -1486 +1486 @@
   number cG = n_SubringGcd(C, cF, r->cf);
 
-  if (!n_IsOne(cG, r))
-  {
-    cF = n_Div(cF, cG, r); n_Normalize(cF, r);
-    C  = n_Div(C,  cG, r); n_Normalize(C, r);
+  if (!n_IsOne(cG, r->cf))
+  {
+    cF = n_Div(cF, cG, r->cf); n_Normalize(cF, r->cf);
+    C  = n_Div(C,  cG, r->cf); n_Normalize(C, r->cf);
   }
   else
   {
-    cF = n_Copy(cF, r);
-    C  = n_Copy(C, r);
-  }
-  n_Delete(&cG,r);
+    cF = n_Copy(cF, r->cf);
+    C  = n_Copy(C, r->cf);
+  }
+  n_Delete(&cG,r->cf);
 
   p2 = p_Mult_nn(p2, C, r); // p2 !!!
   p_Test(p2,r);
-  n_Delete(&C,r);
-  n_Delete(&cG,r);
+  n_Delete(&C,r->cf);
+  n_Delete(&cG,r->cf);
 
   poly out = nc_mm_Mult_pp(m, pNext(p1), r);
@@ -1509 +1509 @@
   p_Test(N,r);
 
-  if (!n_IsMOne(cF,r)) // ???
-  {
-    cF = n_InpNeg(cF,r);
+  if (!n_IsMOne(cF,r->cf)) // ???
+  {
+    cF = n_InpNeg(cF,r->cf);
     N  = p_Mult_nn(N, cF, r);
     p_Test(N,r);
   }
-  n_Delete(&cF,r);
+  n_Delete(&cF,r->cf);
 
   out = p_Add_q(p2,N,r); // delete N, p2
@@ -1571 +1571 @@
   /* GCD stuff */
   number C = n_SubringGcd(C1,C2,r->cf);
-  if (!n_IsOne(C,r))
-  {
-    C1=n_Div(C1,C, r);n_Normalize(C1,r);
-    C2=n_Div(C2,C, r);n_Normalize(C2,r);
+  if (!n_IsOne(C,r->cf))
+  {
+    C1=n_Div(C1,C, r->cf);n_Normalize(C1,r->cf);
+    C2=n_Div(C2,C, r->cf);n_Normalize(C2,r->cf);
   }
   else
   {
-    C1=n_Copy(C1, r);
-    C2=n_Copy(C2, r);
-  }
-  n_Delete(&C,r);
+    C1=n_Copy(C1, r->cf);
+    C2=n_Copy(C2, r->cf);
+  }
+  n_Delete(&C,r->cf);
   M1=p_Mult_nn(M1,C2,r);
   p_SetCoeff(m1,C2,r);
-  if (n_IsMOne(C1,r))
+  if (n_IsMOne(C1,r->cf))
   {
     M2=p_Add_q(M1,M2,r);
@@ -1590 +1590 @@
   else
   {
-    C1=n_InpNeg(C1,r);
+    C1=n_InpNeg(C1,r->cf);
     M2=p_Mult_nn(M2,C1,r);
     M2=p_Add_q(M1,M2,r);
@@ -1754 +1754 @@
   number C = n_SubringGcd(C1, C2, r->cf);           // C = gcd(C1, C2)
 
-  if (!n_IsOne(C, r))                              // if C != 1
-  {
-    C1=n_Div(C1, C, r);n_Normalize(C1,r);            // C1 = C1 / C
-    C2=n_Div(C2, C, r);n_Normalize(C2,r);            // C2 = C2 / C
+  if (!n_IsOne(C, r->cf))                              // if C != 1
+  {
+    C1=n_Div(C1, C, r->cf);n_Normalize(C1,r->cf);            // C1 = C1 / C
+    C2=n_Div(C2, C, r->cf);n_Normalize(C2,r->cf);            // C2 = C2 / C
   }
   else
   {
-    C1=n_Copy(C1,r);
-    C2=n_Copy(C2,r);
-  }
-
-  n_Delete(&C,r); // destroy the number C
-
-  C1=n_InpNeg(C1,r);
+    C1=n_Copy(C1,r->cf);
+    C2=n_Copy(C2,r->cf);
+  }
+
+  n_Delete(&C,r->cf); // destroy the number C
+
+  C1=n_InpNeg(C1,r->cf);
 
 //   number MinusOne=n_Init(-1,r);
@@ -1915 +1915 @@
   M=p_Add_q(M,nc_mm_Mult_p(m,p_LmDeleteAndNext(p_Copy(p1,r),r),r),r); // _pp?
   q=p_Mult_nn(q,C,r);
-  number MinusOne=n_Init(-1,r);
-  if (!n_Equal(cQ,MinusOne,r))
+  number MinusOne=n_Init(-1,r->cf);
+  if (!n_Equal(cQ,MinusOne,r->cf))
   {
     cQ=nInpNeg(cQ);
@@ -1925 +1925 @@
 
   p_Delete(&m,r);
-  n_Delete(&C,r);
-  n_Delete(&cQ,r);
-  n_Delete(&MinusOne,r);
+  n_Delete(&C,r->cf);
+  n_Delete(&cQ,r->cf);
+  n_Delete(&MinusOne,r->cf);
   /*  return(q); */
 }
@@ -1968 +1968 @@
   }
 
-//  n_Delete(&p_GetCoeff(m, r), r);
+//  n_Delete(&p_GetCoeff(m, r), r->cf);
 //  pSetCoeff0(m, NULL);
 
@@ -1983 +1983 @@
   // b will not be multiplied by any constant in this impl.
   // ==> *c=1
-  if (c!=NULL) *c=n_Init(1, r);
+  if (c!=NULL) *c=n_Init(1, r->cf);
   poly m=p_One(r);
   p_ExpVectorDiff(m,kBucketGetLm(b),p, r);
@@ -1993 +1993 @@
   assume(pp!=NULL);
   p_Delete(&m, r);
-  number n=p_GetCoeff(pp, r);
+  number n=pGetCoeff(pp);
   number nn;
-  if (!n_IsMOne(n, r))
-  {
-    nn=n_InpNeg(n_Invers(n, r), r);
-    n= n_Mult(nn,p_GetCoeff(kBucketGetLm(b), r), r);
-    n_Delete(&nn, r);
+  if (!n_IsMOne(n, r->cf))
+  {
+    nn=n_InpNeg(n_Invers(n, r->cf), r->cf);
+    n= n_Mult(nn,pGetCoeff(kBucketGetLm(b)), r->cf);
+    n_Delete(&nn, r->cf);
     pp=p_Mult_nn(pp,n,r);
-    n_Delete(&n, r);
+    n_Delete(&n, r->cf);
   }
   else
@@ -2031 +2031 @@
   // b will not be multiplied by any constant in this impl.
   // ==> *c=1
-  if (c!=NULL) *c=n_Init(1, r);
+  if (c!=NULL) *c=n_Init(1, r->cf);
   poly m = p_One(r);
   const poly pLmB = kBucketGetLm(b); // no new copy!
@@ -2059 +2059 @@
 
   assume( pp != NULL );
-  const number n = p_GetCoeff(pp, r); // bug!
-
-  if (!n_IsMOne(n, r) ) // does this improve performance??!? also see below... // TODO: check later on.
+  const number n = pGetCoeff(pp); // bug!
+
+  if (!n_IsMOne(n, r->cf) ) // does this improve performance??!? also see below... // TODO: check later on.
   // if n == -1 => nn = 1 and -1/n
   {
-    number nn=n_InpNeg(n_Invers(n, r), r);
-    number t = n_Mult(nn,p_GetCoeff(pLmB, r), r);
-    n_Delete(&nn, r);
+    number nn=n_InpNeg(n_Invers(n, r->cf), r->cf);
+    number t = n_Mult(nn,pGetCoeff(pLmB), r->cf);
+    n_Delete(&nn, r->cf);
     pp = p_Mult_nn(pp,t,r);
-    n_Delete(&t, r);
+    n_Delete(&t, r->cf);
   }
   else
@@ -2116 +2116 @@
     //cc=*c;
     //*c=nMult(*c,c2);
-    n_Delete(&c2, r);
+    n_Delete(&c2, r->cf);
     //nDelete(&cc);
     p_Delete(&pp, r);
   }
   if (c!=NULL) *c=ctmp;
-  else n_Delete(&ctmp, r);
+  else n_Delete(&ctmp, r->cf);
 }
 
@@ -2150 +2150 @@
     //cc=*c;
     //*c=nMult(*c,c2);
-    n_Delete(&c2, r);
+    n_Delete(&c2, r->cf);
     //nDelete(&cc);
     p_Delete(&pp, r);
   }
   if (c!=NULL) *c=ctmp;
-  else n_Delete(&ctmp, r);
+  else n_Delete(&ctmp, r->cf);
 }
 
@@ -2164 +2164 @@
   // b will not by multiplied by any constant in this impl.
   // ==> *c=1
-  if (c!=NULL) *c=n_Init(1, r);
+  if (c!=NULL) *c=n_Init(1, r->cf);
   poly m=p_One(r);
   p_ExpVectorDiff(m,p_Head(b, r),p, r);
@@ -2175 +2175 @@
 
   p_Delete(&m, r);
-  number n=p_GetCoeff(pp, r);
+  number n=pGetCoeff(pp);
   number nn;
-  if (!n_IsMOne(n, r))
-  {
-    nn=n_InpNeg(n_Invers(n, r), r);
-    n =n_Mult(nn,p_GetCoeff(b, r), r);
-    n_Delete(&nn, r);
+  if (!n_IsMOne(n, r->cf))
+  {
+    nn=n_InpNeg(n_Invers(n, r->cf), r->cf);
+    n =n_Mult(nn,pGetCoeff(b), r->cf);
+    n_Delete(&nn, r->cf);
     pp=p_Mult_nn(pp,n,r);
-    n_Delete(&n, r);
+    n_Delete(&n, r->cf);
   }
   else
@@ -2211 +2211 @@
   // b will not by multiplied by any constant in this impl.
   // ==> *c=1
-  if (c!=NULL) *c=n_Init(1, r);
+  if (c!=NULL) *c=n_Init(1, r->cf);
 
   poly pp = NULL;
@@ -2271 +2271 @@
   assume(pp != NULL);
 
-  const number n = p_GetCoeff(pp, r); // no new copy
+  const number n = pGetCoeff(pp); // no new copy
 
   number nn;
 
-  if (!n_IsMOne(n, r)) // TODO: as above.
-  {
-    nn=n_InpNeg(n_Invers(n, r), r);
-    number t = n_Mult(nn, p_GetCoeff(b, r), r);
-    n_Delete(&nn, r);
+  if (!n_IsMOne(n, r->cf)) // TODO: as above.
+  {
+    nn=n_InpNeg(n_Invers(n, r->cf), r->cf);
+    number t = n_Mult(nn, pGetCoeff(b), r->cf);
+    n_Delete(&nn, r->cf);
     pp=p_Mult_nn(pp, t, r);
-    n_Delete(&t, r);
+    n_Delete(&t, r->cf);
   }
   else
@@ -2332 +2332 @@
       if (pres!=NULL)
       {
-        coef = n_Mult(p_GetCoeff(p, r),p_GetCoeff(Q, r), r);
+        coef = n_Mult(pGetCoeff(p),pGetCoeff(Q), r->cf);
         pres = p_Mult_nn(pres,coef,r);
 
         sum += pres;
-        n_Delete(&coef, r);
+        n_Delete(&coef, r->cf);
       }
       pIter(Q);
@@ -2378 +2378 @@
           /* compute [ x_j^M1[j],x_i^M2[i] ] */
           if (i<j) {nMax=j;  nMin=i;} else {nMax=i;  nMin=j;}
-          if ( (i==j) || ((MATELEM(r->GetNC()->COM,nMin,nMax)!=NULL) && n_IsOne(p_GetCoeff(MATELEM(r->GetNC()->C,nMin,nMax), r), r) )) /* not (the same exp. or commuting exps)*/
+          if ( (i==j) || ((MATELEM(r->GetNC()->COM,nMin,nMax)!=NULL) && n_IsOne(pGetCoeff(MATELEM(r->GetNC()->C,nMin,nMax)), r->cf) )) /* not (the same exp. or commuting exps)*/
           { bres=NULL; }
           else
@@ -2384 +2384 @@
             if (i<j) { bres=gnc_uu_Mult_ww(j,M1[j],i,M2[i], r); }
             else bres=gnc_uu_Mult_ww(i,M2[i],j,M1[j], r);
-            if (n_IsOne(p_GetCoeff(bres, r), r))
+            if (n_IsOne(pGetCoeff(bres), r->cf))
             {
               bres=p_LmDeleteAndNext(bres, r);
@@ -2390 +2390 @@
             else
             {
-              nTmp=n_Sub(p_GetCoeff(bres, r),n_Init(1, r), r);
+              nTmp=n_Sub(pGetCoeff(bres),n_Init(1, r->cf), r->cf);
               p_SetCoeff(bres,nTmp, r); /* only lc ! */
             }
@@ -2511 +2511 @@
             pIter(p);
           }
-          number ntd = n_Init(totdeg, r);
-          number nln = n_Init(length, r);
-          number nres= n_Div(ntd,nln, r);
-          n_Delete(&ntd, r);
-          n_Delete(&nln, r);
+          number ntd = n_Init(totdeg, r->cf);
+          number nln = n_Init(length, r->cf);
+          number nres= n_Div(ntd,nln, r->cf);
+          n_Delete(&ntd, r->cf);
+          n_Delete(&nln, r->cf);
           MATELEM(res,s,t)=p_NSet(nres,r);
         }
@@ -2884 +2884 @@
     assume(p_IsConstant(CN,curr));
 
-    nN = p_GetCoeff(CN, curr);
-    if (n_IsZero(nN, curr))
+    nN = pGetCoeff(CN);
+    if (n_IsZero(nN, curr->cf))
     {
       WerrorS("Incorrect input : zero coefficients are not allowed");
@@ -2894 +2894 @@
     }
 
-    if (n_IsOne(nN, curr))
+    if (n_IsOne(nN, curr->cf))
       nctype = nc_lie;
     else
@@ -2968 +2968 @@
     IsSkewConstant = tmpIsSkewConstant;
 
-    if ( tmpIsSkewConstant && n_IsOne(pN, curr) )
+    if ( tmpIsSkewConstant && n_IsOne(pN, curr->cf) )
       nctype = nc_lie;
     else
@@ -3154 +3154 @@
       p = p_One(r);
       if (MATELEM(r->GetNC()->C,i,j)!=NULL)
-        p_SetCoeff(p,n_Copy(pGetCoeff(MATELEM(r->GetNC()->C,i,j)),r),r);
+        p_SetCoeff(p,n_Copy(pGetCoeff(MATELEM(r->GetNC()->C,i,j)),r->cf),r);
       p_SetExp(p,i,1,r);
       p_SetExp(p,j,1,r);

libpolys/polys/nc/sca.cc

@@ -186 +186 @@
 
     if( (tpower) != 0 ) // degree is odd => negate coeff.
-      nCoeffM = n_InpNeg(nCoeffM, rRing); // negate nCoeff (will destroy the original number)
+      nCoeffM = n_InpNeg(nCoeffM, rRing->cf); // negate nCoeff (will destroy the original number)
 
     const number nCoeffMM = p_GetCoeff(pMonomMM, rRing); // no new copy!
 
-    number nCoeff = n_Mult(nCoeffM, nCoeffMM, rRing); // new number!
+    number nCoeff = n_Mult(nCoeffM, nCoeffMM, rRing->cf); // new number!
 
     p_SetCoeff(pMonomM, nCoeff, rRing); // delete lc(pMonomM) and set lc(pMonomM) = nCoeff
@@ -250 +250 @@
 
     if( (tpower) != 0 ) // degree is odd => negate coeff.
-      nCoeffM = n_InpNeg(nCoeffM, rRing); // negate nCoeff (will destroy the original number), creates new number!
+      nCoeffM = n_InpNeg(nCoeffM, rRing->cf); // negate nCoeff (will destroy the original number), creates new number!
 
     const number nCoeffMM = p_GetCoeff(pMonomMM, rRing); // no new copy!
 
-    number nCoeff = n_Mult(nCoeffM, nCoeffMM, rRing); // new number!
+    number nCoeff = n_Mult(nCoeffM, nCoeffMM, rRing->cf); // new number!
 
     p_SetCoeff(pMonomM, nCoeff, rRing); // delete lc(pMonomM) and set lc(pMonomM) = nCoeff
@@ -318 +318 @@
     const number nCoeff2 = p_GetCoeff(pMonom2, rRing); // no new copy!
 
-    number nCoeff = n_Mult(nCoeff1, nCoeff2, rRing); // new number!
+    number nCoeff = n_Mult(nCoeff1, nCoeff2, rRing->cf); // new number!
 
     if( (tpower) != 0 ) // degree is odd => negate coeff.
-      nCoeff = n_InpNeg(nCoeff, rRing); // negate nCoeff (will destroy the original number)
+      nCoeff = n_InpNeg(nCoeff, rRing->cf); // negate nCoeff (will destroy the original number)
 
     p_SetCoeff0(pResult, nCoeff, rRing); // set lc(pResult) = nCoeff, no destruction!
@@ -363 +363 @@
     p_Setm(pResult, rRing);         // addjust degree after previous step!
 
-    number nCoeff = n_Copy(p_GetCoeff(pMonom, rRing), rRing); // new number!
+    number nCoeff = n_Copy(pGetCoeff(pMonom), rRing->cf); // new number!
 
     if( cpower != 0 ) // degree is odd => negate coeff.
-      nCoeff = n_InpNeg(nCoeff, rRing); // negate nCoeff (will destroy the original number)
+      nCoeff = n_InpNeg(nCoeff, rRing->cf); // negate nCoeff (will destroy the original number)
 
     p_SetCoeff0(pResult, nCoeff, rRing); // set lc(pResult) = nCoeff, no destruction!
@@ -791 +791 @@
   p_Delete(&pL,r);
 
-  number C1  = n_Copy(p_GetCoeff(p1,r),r);      // C1 = lc(p1)
-  number C2  = n_Copy(p_GetCoeff(p2,r),r);      // C2 = lc(p2)
-
-  number C = n_Gcd(C1,C2,r);                     // C = gcd(C1, C2)
-
-  if (!n_IsOne(C, r))                              // if C != 1
-  {
-    C1=n_Div(C1, C, r);                              // C1 = C1 / C
-    C2=n_Div(C2, C, r);                              // C2 = C2 / C
-  }
-
-  n_Delete(&C,r); // destroy the number C
+  number C1  = n_Copy(pGetCoeff(p1),r->cf);      // C1 = lc(p1)
+  number C2  = n_Copy(pGetCoeff(p2),r->cf);      // C2 = lc(p2)
+
+  number C = n_Gcd(C1,C2,r->cf);                     // C = gcd(C1, C2)
+
+  if (!n_IsOne(C, r->cf))                              // if C != 1
+  {
+    C1=n_Div(C1, C, r->cf);                              // C1 = C1 / C
+    C2=n_Div(C2, C, r->cf);                              // C2 = C2 / C
+  }
+
+  n_Delete(&C,r->cf); // destroy the number C
 
   const int iSignSum = sca_Sign_mm_Mult_mm (m1, p1, r) + sca_Sign_mm_Mult_mm (m2, p2, r);
@@ -810 +810 @@
 
   if( iSignSum != 0 ) // the same sign!
-    C2=n_InpNeg (C2, r);
+    C2=n_InpNeg (C2, r->cf);
 
   p_SetCoeff(m1, C2, r);                           // lc(m1) = C2!!!
@@ -865 +865 @@
 #endif
 
-  number C1 = n_Copy( p_GetCoeff(p1, r), r);
-  number C2 = n_Copy( p_GetCoeff(p2, r), r);
+  number C1 = n_Copy( pGetCoeff(p1), r->cf);
+  number C2 = n_Copy( pGetCoeff(p2), r->cf);
 
   /* GCD stuff */
-  number C = n_Gcd(C1, C2, r);
-
-  if (!n_IsOne(C, r))
-  {
-    C1 = n_Div(C1, C, r);
-    C2 = n_Div(C2, C, r);
-  }
-  n_Delete(&C,r);
+  number C = n_Gcd(C1, C2, r->cf);
+
+  if (!n_IsOne(C, r->cf))
+  {
+    C1 = n_Div(C1, C, r->cf);
+    C2 = n_Div(C2, C, r->cf);
+  }
+  n_Delete(&C,r->cf);
 
   const int iSign = sca_Sign_mm_Mult_mm( m, p1, r );
 
   if(iSign == 1)
-    C2 = n_InpNeg(C2,r);
+    C2 = n_InpNeg(C2,r->cf);
 
   p_SetCoeff(m, C2, r);
@@ -892 +892 @@
 
   p2 = p_Mult_nn(p2, C1, r); // p2 !!!
-  n_Delete(&C1,r);
+  n_Delete(&C1,r->cf);
 
   poly T = nc_mm_Mult_pp(m, pNext(p1), r);
@@ -1007 +1007 @@
       number c = p_GetCoeff(MATELEM(C,i,j), rBase);
 
-      if( n_IsMOne(c, rBase) ) // !!!???
+      if( n_IsMOne(c, rBase->cf) ) // !!!???
       {
         if( i < iAltVarStart)
@@ -1016 +1016 @@
       } else
       {
-        if( !n_IsOne(c, rBase) )
+        if( !n_IsOne(c, rBase->cf) )
         {
 #if ((defined(PDEBUG) && OUTPUT) || MYTEST)
@@ -1045 +1045 @@
       if( (iAltVarStart <= i) && (j <= iAltVarEnd) ) // S <= i < j <= E
       { // anticommutative part
-        if( !n_IsMOne(c, rBase) )
+        if( !n_IsMOne(c, rBase->cf) )
         {
 #if ((defined(PDEBUG) && OUTPUT) || MYTEST)
@@ -1052 +1052 @@
           return false;
         }
-      } else
+      }
+      else
       { // should commute
-        if( !n_IsOne(c, rBase) )
+        if( !n_IsOne(c, rBase->cf) )
         {
 #if ((defined(PDEBUG) && OUTPUT) || MYTEST)

libpolys/polys/sparsmat.cc

@@ -2751 +2751 @@
         {
           ap->n = a->n;
-          a->m = n_InpNeg(a->m,_R);
+          a->m = n_InpNeg(a->m,_R->cf);
           b = b->n = a;
           b->pos = i;
@@ -2761 +2761 @@
     {
       m_act[i] = a->n;
-      a->m = n_InpNeg(a->m,_R);
+      a->m = n_InpNeg(a->m,_R->cf);
       b = b->n = a;
       b->pos = i;