Changeset 1adb76 in git for kernel

Timestamp:

Sep 25, 2021, 3:12:28 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3586d91e2c2266ac9093d8f200ff040122e65211

Parents:

a178ae5229393bf22d9dd493679de1c14137e994

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-09-25 15:12:28+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-09-25 15:17:38+02:00

Message:

use n_..(,cf) instead of n_..(,R)

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (6 diffs)
• kstd2.cc (modified) (8 diffs)
• syz4.cc (modified) (2 diffs)

kernel/GBEngine/kspoly.cc

@@ -514 +514 @@
 
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
-  p_SetCoeff(lm, n_Init(1, tailRing), tailRing);
+  p_SetCoeff(lm, n_Init(1, tailRing->cf), tailRing);
   while (PW->max_exp != NULL && !p_LmExpVectorAddIsOk(lm, PW->max_exp, tailRing))
   {
@@ -629 +629 @@
   {                       // just cancel the leading term
     PR->LmDeleteAndIter();
-    if (coef != NULL) *coef = n_Init(1, tailRing);
+    if (coef != NULL) *coef = n_Init(1, tailRing->cf);
     return 0;
   }
@@ -665 +665 @@
 
   // take care of coef buisness
-  if (! n_IsOne(pGetCoeff(p2), tailRing))
+  if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
   {
     number bn = pGetCoeff(lm);
@@ -674 +674 @@
       PR->Tail_Mult_nn(an);
     if (coef != NULL) *coef = an;
-    else n_Delete(&an, tailRing);
+    else n_Delete(&an, tailRing->cf);
   }
   else
   {
-    if (coef != NULL) *coef = n_Init(1, tailRing);
+    if (coef != NULL) *coef = n_Init(1, tailRing->cf);
   }
 
@@ -1386 +1386 @@
   if (!ret)
   {
-    if (! n_IsOne(coef, currRing))
+    if (! n_IsOne(coef, currRing->cf))
     {
       pNext(Current) = NULL;
@@ -1394 +1394 @@
     }
 
-    n_Delete(&coef, currRing);
+    n_Delete(&coef, currRing->cf);
     pNext(Current) = Red.GetLmTailRing();
     if (Current == PR->p && PR->t_p != NULL)

kernel/GBEngine/kstd2.cc

@@ -159 +159 @@
         {
             mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
             {
                 return 0;
@@ -168 +168 @@
         {
             mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
             {
                 return 0;
@@ -186 +186 @@
         {
             mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
             {
                 return 0;
@@ -195 +195 @@
         {
             mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
             {
                 return 0;
@@ -229 +229 @@
       {
         mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
-        if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
         {
           o = j;
@@ -239 +239 @@
       {
         mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
-        if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
         {
           o = j;
@@ -262 +262 @@
       {
         mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].t_p), &rest, r->cf);
-        if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
         {
           o = j;
@@ -272 +272 @@
       {
         mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].t_p), &rest, r->cf);
-        if (!n_IsZero(mult, r) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
+        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
         {
           o = j;

kernel/GBEngine/syz4.cc

@@ -141 +141 @@
         p_SetComp(q, v[i].comp, r);
         p_Setm(q, r);
-        number n = n_Div(p_GetCoeff(multiplier, r), p_GetCoeff(v[i].lt, r), r);
-        n_InpMult(n, p_GetCoeff(t, r), r);
-        p_SetCoeff0(q, n_InpNeg(n, r), r);
+        number n = n_Div(p_GetCoeff(multiplier, r), p_GetCoeff(v[i].lt, r), r->cf);
+        n_InpMult(n, p_GetCoeff(t, r), r->cf);
+        p_SetCoeff0(q, n_InpNeg(n, r->cf), r);
         return q;
     }
@@ -267 +267 @@
     const ring r = currRing;
     poly p = p_Copy(itr->second, r);
-    if (LIKELY(!n_Equal(pGetCoeff(multiplier), pGetCoeff(itr->first), r)))
-    {
-        number n = n_Div(pGetCoeff(multiplier), pGetCoeff(itr->first), r);
+    if (LIKELY(!n_Equal(pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf)))
+    {
+        number n = n_Div(pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf);
         p = p_Mult_nn(p, n, r);
-        n_Delete(&n, r);
+        n_Delete(&n, r->cf);
     }
     return p;