Changeset 4763e2 in git for kernel

Timestamp:

Oct 10, 2016, 7:27:50 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b6850332257d4e1a4479e878883bd0141e1dfa54

Parents:

e0328f3e0ed521d91b54b0ac2f870d02b0f0ab23

Message:

rename TObject_max to TObjec->max_exp

Location:

kernel/GBEngine

Files:

• kInline.h (modified) (1 diff)
• kspoly.cc (modified) (4 diffs)
• kstdfac.cc (modified) (1 diff)
• kutil.cc (modified) (13 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kInline.h

@@ -376 +376 @@
     }
   }
-  if (max != NULL)
-  {
-    if (new_tailRing == currRing)
-    {
-      p_LmFree(max, tailRing);
-      max = NULL;
-    }
-    else
-      max = p_shallow_copy_delete(max,tailRing,new_tailRing,new_tailBin);
-  }
-  else if (set_max && new_tailRing != currRing && pNext(t_p) != NULL)
-  {
-    max = p_GetMaxExpP(pNext(t_p), new_tailRing);
+  if (max_exp != NULL)
+  {
+    max_exp = p_shallow_copy_delete(max_exp,tailRing,new_tailRing,new_tailBin);
+  }
+  else if (set_max && pNext(t_p) != NULL)
+  {
+    max_exp = p_GetMaxExpP(pNext(t_p), new_tailRing);
   }
   tailRing = new_tailRing;

kernel/GBEngine/kspoly.cc

@@ -111 +111 @@
   {
     // check that reduction does not violate exp bound
-    while (PW->max != NULL && !p_LmExpVectorAddIsOk(lm, PW->max, tailRing))
+    while (PW->max_exp != NULL && !p_LmExpVectorAddIsOk(lm, PW->max_exp, tailRing))
     {
       // undo changes of lm
@@ -243 +243 @@
   {
     // check that reduction does not violate exp bound
-    while (PW->max != NULL && !p_LmExpVectorAddIsOk(lm, PW->max, tailRing))
+    while (PW->max_exp != NULL && !p_LmExpVectorAddIsOk(lm, PW->max_exp, tailRing))
     {
       // undo changes of lm
@@ -449 +449 @@
   {
     // check that reduction does not violate exp bound
-    while (PW->max != NULL && !p_LmExpVectorAddIsOk(lm, PW->max, tailRing))
+    while (PW->max_exp != NULL && !p_LmExpVectorAddIsOk(lm, PW->max_exp, tailRing))
     {
       // undo changes of lm
@@ -699 +699 @@
   {
     // check that reduction does not violate exp bound
-    while (PW->max != NULL && !p_LmExpVectorAddIsOk(lm, PW->max, tailRing))
+    while (PW->max_exp != NULL && !p_LmExpVectorAddIsOk(lm, PW->max_exp, tailRing))
     {
       // undo changes of lm

kernel/GBEngine/kstdfac.cc

@@ -57 +57 @@
     }
     t[j].t_p = NULL; // ?? or t[j].p ??
-    t[j].max = NULL; // ?? or p_GetMaxExpP(t[j].t_p,o->tailRing); ??
+    t[j].max_exp = NULL; // ?? or p_GetMaxExpP(t[j].t_p,o->tailRing); ??
     t[j].pLength =  pLength(p);
   }

kernel/GBEngine/kutil.cc

@@ -279 +279 @@
             pNext(L->p) = NULL;
           }
-          L->max  = NULL;
+          L->max_exp  = NULL;
         }
         else if (fromNext)
-          L->max  = p_GetMaxExpP(pNext(L->p), L->tailRing ); // p1;
+          L->max_exp  = p_GetMaxExpP(pNext(L->p), L->tailRing ); // p1;
         //if (L->pLength != 0)
         L->pLength = l;
@@ -388 +388 @@
         //if (L->pLength > 0)
         L->pLength = 1;
-        L->max = NULL;
+        L->max_exp = NULL;
 
         if (L->t_p != NULL && pNext(L->t_p) != NULL)
@@ -448 +448 @@
         //if (L->pLength > 0)
         L->pLength = 1;
-        L->max = NULL;
+        L->max_exp = NULL;
 
         if (L->t_p != NULL && pNext(L->t_p) != NULL)
@@ -564 +564 @@
     p = strat->T[j].p;
     strat->T[j].p=NULL;
-    if (strat->T[j].max != NULL)
-    {
-      p_LmFree(strat->T[j].max, strat->tailRing);
+    if (strat->T[j].max_exp != NULL)
+    {
+      p_LmFree(strat->T[j].max_exp, strat->tailRing);
     }
     i = -1;
@@ -615 +615 @@
     p = strat->T[j].p;
     strat->T[j].p=NULL;
-    if (strat->T[j].max != NULL)
-    {
-      p_LmFree(strat->T[j].max, strat->tailRing);
+    if (strat->T[j].max_exp != NULL)
+    {
+      p_LmFree(strat->T[j].max_exp, strat->tailRing);
     }
     i = -1;
@@ -804 +804 @@
       if (pNext(T->t_p) == NULL)
       {
-        if (T->max != NULL)
-          return dReportError("%c[%d].max is not NULL as it should be", TN, i);
+        if (T->max_exp != NULL)
+          return dReportError("%c[%d].max_exp is not NULL as it should be", TN, i);
       }
       else
       {
-        if (T->max == NULL)
-          return dReportError("%c[%d].max is NULL", TN, i);
-        if (pNext(T->max) != NULL)
-          return dReportError("pNext(%c[%d].max) != NULL", TN, i);
-
-        pFalseReturn(p_CheckPolyRing(T->max, tailRing));
-        omCheckBinAddrSize(T->max, (omSizeWOfBin(tailRing->PolyBin))*SIZEOF_LONG);
+        if (T->max_exp == NULL)
+          return dReportError("%c[%d].max_exp is NULL", TN, i);
+        if (pNext(T->max_exp) != NULL)
+          return dReportError("pNext(%c[%d].max_exp) != NULL", TN, i);
+
+        pFalseReturn(p_CheckPolyRing(T->max_exp, tailRing));
+        omCheckBinAddrSize(T->max_exp, (omSizeWOfBin(tailRing->PolyBin))*SIZEOF_LONG);
 #if KDEBUG > 0
         if (! sloppy_max)
         {
           poly test_max = p_GetMaxExpP(pNext(T->t_p), tailRing);
-          p_Setm(T->max, tailRing);
+          p_Setm(T->max_exp, tailRing);
           p_Setm(test_max, tailRing);
-          BOOLEAN equal = p_ExpVectorEqual(T->max, test_max, tailRing);
+          BOOLEAN equal = p_ExpVectorEqual(T->max_exp, test_max, tailRing);
           if (! equal)
             return dReportError("%c[%d].max out of sync", TN, i);
@@ -9546 +9546 @@
   //printf("\nenterT: neue hingefÌgt: lÀnge = %i, ecart = %i\n",p.length,p.ecart);
 
-  if (strat->tailRing != currRing && pNext(p.p) != NULL)
-    strat->T[atT].max = p_GetMaxExpP(pNext(p.p), strat->tailRing);
+  if (pNext(p.p) != NULL)
+    strat->T[atT].max_exp = p_GetMaxExpP(pNext(p.p), strat->tailRing);
   else
-    strat->T[atT].max = NULL;
+    strat->T[atT].max_exp = NULL;
 
   strat->tl++;
@@ -9632 +9632 @@
   //printf("\nenterT_strong: neue hingefÌgt: lÀnge = %i, ecart = %i\n",p.length,p.ecart);
 
-  if (strat->tailRing != currRing && pNext(p.p) != NULL)
-    strat->T[atT].max = p_GetMaxExpP(pNext(p.p), strat->tailRing);
+  if (pNext(p.p) != NULL)
+    strat->T[atT].max_exp = p_GetMaxExpP(pNext(p.p), strat->tailRing);
   else
-    strat->T[atT].max = NULL;
+    strat->T[atT].max_exp = NULL;
 
   strat->tl++;
@@ -10675 +10675 @@
       #endif
 
-      if (strat->redTailChange && strat->tailRing != currRing)
-      {
-        if (T_j->max != NULL) p_LmFree(T_j->max, strat->tailRing);
+      if (strat->redTailChange)
+      {
+        if (T_j->max_exp != NULL) p_LmFree(T_j->max_exp, strat->tailRing);
         if (pNext(T_j->p) != NULL)
-          T_j->max = p_GetMaxExpP(pNext(T_j->p), strat->tailRing);
+          T_j->max_exp = p_GetMaxExpP(pNext(T_j->p), strat->tailRing);
         else
-          T_j->max = NULL;
+          T_j->max_exp = NULL;
       }
       if (TEST_OPT_INTSTRATEGY)
@@ -10827 +10827 @@
     return TRUE;
   }
-  poly p1_max = (strat->R[L->i_r1])->max;
-  poly p2_max = (strat->R[L->i_r2])->max;
+  poly p1_max = (strat->R[L->i_r1])->max_exp;
+  poly p2_max = (strat->R[L->i_r2])->max_exp;
 
   if (((p1_max != NULL) && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
@@ -10854 +10854 @@
   //assume(strat->tailRing != currRing);
 
-  poly p1_max = (strat->R[atR])->max;
-  poly p2_max = (strat->R[strat->S_2_R[atS]])->max;
+  poly p1_max = (strat->R[atR])->max_exp;
+  poly p2_max = (strat->R[strat->S_2_R[atS]])->max_exp;
 
   if (((p1_max != NULL) && !p_LmExpVectorAddIsOk(m1, p1_max, strat->tailRing)) ||
@@ -11323 +11323 @@
       L->p = t_l->p;
       L->t_p = t_l->t_p;
-      L->max = t_l->max;
+      L->max_exp = t_l->max_exp;
     }
   }
@@ -12736 +12736 @@
     qq      = p; //qq.Copy();
     qq.p    = NULL;
-    qq.max  = NULL;
+    qq.max_exp  = NULL;
     qq.t_p = p_LPshift(p_Copy(p.t_p,strat->tailRing), i, uptodeg, lV, strat->tailRing); // direct shift
     qq.GetP();

kernel/GBEngine/kutil.h

@@ -75 +75 @@
   poly p;       // Lm(p) \in currRing Tail(p) \in tailRing
   poly t_p;     // t_p \in tailRing: as monomials Lm(t_p) == Lm(p)
-  poly max;     // p_GetMaxExpP(pNext(p))
+  poly max_exp;     // p_GetMaxExpP(pNext(p))
   ring tailRing;
   long FDeg;    // pFDeg(p)