Changeset 06abb07 in git for kernel/GBEngine

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

59dca7d44c6d942796166db1c0ac9621d2a5ee39

Parents:

c4ead28a352d5f3846b80a454f239a0ef2b5af5a

Message:

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

Location:

kernel/GBEngine

Files:

• kInline.h (modified) (1 diff)
• kspoly.cc (modified) (11 diffs)
• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (8 diffs)
• kutil.cc (modified) (11 diffs)
• tgb.cc (modified) (2 diffs)
• tgbgauss.cc (modified) (3 diffs)

kernel/GBEngine/kInline.h

@@ -1130 +1130 @@
     if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at]))
       return;
-    if(!n_DivBy(pGetCoeff(strat->S[*at]), pGetCoeff(p), currRing))
+    if(!n_DivBy(pGetCoeff(strat->S[*at]), pGetCoeff(p), currRing->cf))
       return;
   }

kernel/GBEngine/kspoly.cc

@@ -97 +97 @@
   {                       // 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;
   }
@@ -123 +123 @@
 
   // take care of coef buisness
-  if (! n_IsOne(pGetCoeff(p2), tailRing))
+  if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
   {
     number bn = pGetCoeff(lm);
@@ -132 +132 @@
       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);
   }
 
@@ -303 +303 @@
   {                       // 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;
   }
@@ -329 +329 @@
 
   // take care of coef buisness
-  if (! n_IsOne(pGetCoeff(p2), tailRing))
+  if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
   {
     number bn = pGetCoeff(lm);
@@ -338 +338 @@
       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);
   }
 
@@ -553 +553 @@
   {                       // 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;
   }
@@ -581 +581 @@
   {
     p_SetCoeff(lm, nDiv(pGetCoeff(lm),pGetCoeff(p2)), tailRing);
-    if (coef != NULL) *coef = n_Init(1, tailRing);
+    if (coef != NULL) *coef = n_Init(1, tailRing->cf);
   }
   else
   {
-    if (! n_IsOne(pGetCoeff(p2), tailRing))
+    if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
     {
       number bn = pGetCoeff(lm);
@@ -594 +594 @@
         PR->Tail_Mult_nn(an);
       if (coef != NULL) *coef = an;
-      else n_Delete(&an, tailRing);
-    }
-    else
-    {
-      if (coef != NULL) *coef = n_Init(1, tailRing);
+      else n_Delete(&an, tailRing->cf);
+    }
+    else
+    {
+      if (coef != NULL) *coef = n_Init(1, tailRing->cf);
     }
   }
@@ -772 +772 @@
   if (!ret)
   {
-    if (! n_IsOne(coef, currRing))
+    if (! n_IsOne(coef, currRing->cf))
     {
       pNext(Current) = NULL;
@@ -780 +780 @@
     }
 
-    n_Delete(&coef, currRing);
+    n_Delete(&coef, currRing->cf);
     pNext(Current) = Red.GetLmTailRing();
     if (Current == PR->p && PR->t_p != NULL)

kernel/GBEngine/kstd1.cc

@@ -443 +443 @@
             p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i], h->GetLmTailRing(), ~h->sev, strat->tailRing)
             &&
-            n_DivBy(h->p->coef,strat->T[i].p->coef,strat->tailRing))
+            n_DivBy(h->p->coef,strat->T[i].p->coef,strat->tailRing->cf))
 #else
           j = kFindDivisibleByInT(strat, h, i);
@@ -859 +859 @@
     #endif
     if (p_LmShortDivisibleBy(strat->T[j].GetLmTailRing(), strat->sevT[j], H.GetLmTailRing(), not_sev, strat->tailRing)
-        && (n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing))
+        && (n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing->cf))
         )
     {
@@ -885 +885 @@
         && (strat->T[j].length < li)))
         && pLmShortDivisibleBy(strat->T[j].p,strat->sevT[j], H.p, not_sev)
-        && (n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing))
+        && (n_DivBy(H.p->coef, strat->T[j].p->coef,strat->tailRing->cf))
         )
         {

kernel/GBEngine/kstd2.cc

@@ -108 +108 @@
         if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
         {
-          if(n_DivBy(p_GetCoeff(p,r), p_GetCoeff(T[j].p,r), r))
+          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].p), r->cf))
             return j;
         }
@@ -115 +115 @@
           p_LmDivisibleBy(T[j].p, p, r))
         {
-          if(n_DivBy(p_GetCoeff(p,r), p_GetCoeff(T[j].p,r), r))
+          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].p), r->cf))
             return j;
         }
@@ -156 +156 @@
                                p, not_sev, r))
         {
-          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].t_p), r))
+          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].t_p), r->cf))
             return j;
         }
@@ -163 +163 @@
           p_LmDivisibleBy(T[j].t_p, p, r))
         {
-          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].t_p), r))
+          if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].t_p), r->cf))
             return j;
         }
@@ -220 +220 @@
                              p, not_sev, currRing))
       {
-        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing))
+        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing->cf))
           return j;
       }
@@ -227 +227 @@
          p_LmDivisibleBy(strat->S[j], p, currRing))
       {
-        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing))
+        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing->cf))
           return j;
       }
@@ -278 +278 @@
                              p, not_sev, currRing))
       {
-        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing))
+        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing->cf))
           return j;
       }
@@ -285 +285 @@
          p_LmDivisibleBy(strat->S[j], p, currRing))
       {
-        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing))
+        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing->cf))
           return j;
       }

kernel/GBEngine/kutil.cc

@@ -4040 +4040 @@
           for (i=strat->Bl; i>=0; i--)
           {
-            if (pDivisibleBy(strat->S[j],strat->B[i].lcm) && n_DivBy(strat->B[i].lcm->coef, strat->S[j]->coef,currRing))
+            if (pDivisibleBy(strat->S[j],strat->B[i].lcm) && n_DivBy(pGetCoeff(strat->B[i].lcm), pGetCoeff(strat->S[j]),currRing->cf))
             {
 #ifdef KDEBUG
@@ -7138 +7138 @@
     if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing)
     && (!rField_is_Ring(currRing) ||
-    (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1)))
+    (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing->cf) && pLtCmp(sig,strat->syz[k]) == 1)))
     {
 //#if 1
@@ -7195 +7195 @@
       if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing)
       && (!rField_is_Ring(currRing) ||
-      (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1)))
+      (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing->cf) && pLtCmp(sig,strat->syz[k]) == 1)))
       {
         #ifdef ADIDEBUG
@@ -7411 +7411 @@
   #if defined(PDEBUG) || defined(PDIV_DEBUG)
         if (strat->S[j]!= NULL && p_LmShortDivisibleBy(strat->S[j], sev[j], p, not_sev, r) &&
-            (ecart== LONG_MAX || ecart>= strat->ecartS[j]) && n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r))
+            (ecart== LONG_MAX || ecart>= strat->ecartS[j]) && n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r->cf))
         {
           break;
@@ -7418 +7418 @@
         if (!(sev[j] & not_sev) &&
             (ecart== LONG_MAX || ecart>= strat->ecartS[j]) &&
-            p_LmDivisibleBy(strat->S[j], p, r) && n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r))
+            p_LmDivisibleBy(strat->S[j], p, r) && n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r->cf))
         {
           break;
@@ -7483 +7483 @@
         assume(t != NULL && t->t_p != NULL && t->tailRing == r);
         if (p_LmShortDivisibleBy(t->t_p, sev[j], p, not_sev, r) &&
-            (ecart== LONG_MAX || ecart>= strat->ecartS[j]) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r))
+            (ecart== LONG_MAX || ecart>= strat->ecartS[j]) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r->cf))
         {
           return t;
@@ -7492 +7492 @@
           t = strat->S_2_T(j);
           assume(t != NULL && t->t_p != NULL && t->tailRing == r && t->p == strat->S[j]);
-          if (p_LmDivisibleBy(t->t_p, p, r) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r))
+          if (p_LmDivisibleBy(t->t_p, p, r) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r->cf))
           {
             return t;
@@ -9615 +9615 @@
                               #ifdef HAVE_RINGS
                               &&((!rField_is_Ring(currRing))
-                              || (n_DivBy(pGetCoeff(strat->L[cc].sig),pGetCoeff(strat->syz[atT]),currRing) && (pLtCmp(strat->L[cc].sig,strat->syz[atT])==1)))
+                              || (n_DivBy(pGetCoeff(strat->L[cc].sig),pGetCoeff(strat->syz[atT]),currRing->cf) && (pLtCmp(strat->L[cc].sig,strat->syz[atT])==1)))
                               #endif
                               )
@@ -10353 +10353 @@
             &&(pLmDivisibleBy(Q->m[q],r->m[l])))
             {
-              if(n_DivBy(r->m[l]->coef, Q->m[q]->coef, currRing))
+              if(n_DivBy(r->m[l]->coef, Q->m[q]->coef, currRing->cf))
               {
                 if (TEST_OPT_REDSB)
@@ -10416 +10416 @@
           for(q=IDELEMS(Q)-1; q>=0;q--)
           {
-            if(n_DivBy(r->m[l]->coef, Q->m[q]->coef, currRing))
+            if(n_DivBy(r->m[l]->coef, Q->m[q]->coef, currRing->cf))
             {
               if ((Q->m[q]!=NULL)&&(pLmEqual(Q->m[q],r->m[l])) && pDivisibleBy(Q->m[q],r->m[l]))
@@ -10453 +10453 @@
               && (r->m[q]!=NULL)
               &&(pLmDivisibleBy(r->m[l],r->m[q]))
-              &&(n_DivBy(r->m[q]->coef, r->m[l]->coef, currRing))
+              &&(n_DivBy(r->m[q]->coef, r->m[l]->coef, currRing->cf))
               )
               {
                 //If they are equal then take the one with the smallest length
                 if(pLmDivisibleBy(r->m[q],r->m[l])
-                && n_DivBy(r->m[q]->coef, r->m[l]->coef, currRing)
+                && n_DivBy(r->m[q]->coef, r->m[l]->coef, currRing->cf)
                 && (pLength(r->m[q]) < pLength(r->m[l]) ||
                 (pLength(r->m[q]) == pLength(r->m[l]) && nGreaterZero(r->m[q]->coef))))

kernel/GBEngine/tgb.cc

@@ -83 +83 @@
   else
   {
-    return n_Size (n, r);
+    return n_Size (n, r->cf);
   }
 }
@@ -143 +143 @@
 {
   poly rc = p_Init_Special (r);
-  pSetCoeff0 (rc, n_Init (1, r));
+  pSetCoeff0 (rc, n_Init (1, r->cf));
   return rc;
 }

kernel/GBEngine/tgbgauss.cc

@@ -510 +510 @@
     {
       StringSetS("");
-      n_Write(n[i][j],currRing);
+      n_Write(n[i][j],currRing->cf);
       char *s=StringEndS();
       PrintS(s);
@@ -711 +711 @@
       StringSetS("");
       number n=get(i,j);
-      n_Write(n,currRing);
+      n_Write(n,currRing->cf);
       char *s=StringEndS();
       PrintS(s);
@@ -842 +842 @@
       if (currRing==r) {nTest(m->coef);}
       #endif
-      n_Normalize(m->coef,r);
+      n_Normalize(m->coef,r->cf);
       m=m->next;
     }