Changeset f3be8e6 in git

Timestamp:

Apr 20, 2020, 9:21:39 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

3e34f20459fa942914b03f47d052e3e393078b02756dc7155d3cba64f765acc3475e5c4e12cdbbffda334f04d062863798ea2bd549c83b75607883fa

Parents:

9904f67850aa704dcd1dcd5e95035cee753e8a74

Message:

format, debug stuff

File:

• kernel/GBEngine/kutil.cc (modified) (8 diffs)

kernel/GBEngine/kutil.cc

@@ -968 +968 @@
     poly p;
     L->GetLm(p, r);
-    if (L->sev != 0 && p_GetShortExpVector(p, r) != L->sev)
-    {
-      return dReportError("L[%d] wrong sev: has %o, specified to have %o",
+    if (L->sev != 0L)
+    {
+      if (p_GetShortExpVector(p, r) != L->sev)
+      {
+        return dReportError("L[%d] wrong sev: has %lo, specified to have %lo",
                           lpos, p_GetShortExpVector(p, r), L->sev);
+      }
     }
   }
@@ -1557 +1560 @@
   if (currRing!=strat->tailRing)
     h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
+  if (strat->P.p!=NULL) strat->P.sev = pGetShortExpVector(strat->P.p);
+  else strat->P.sev=0L;
   enterL(&strat->B,&strat->Bl,&strat->Bmax,h,posx);
   kTest_TS(strat);
@@ -6984 +6989 @@
   int cc = (-1+2*currRing->order[0]==ringorder_c);
   /* cc==1 for (c,..), cc==-1 for (C,..) */
-  unsigned long c = pGetComp(p->p)*cc;
+  long c = pGetComp(p->p)*cc;
   int o = p->GetpFDeg() + p->ecart;
 
@@ -9596 +9601 @@
   if (strat->homog) strat->initEcart(&p);
       strat->redTailChange=FALSE;
-  if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing))) {
+  if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+  {
     p.pCleardenom();
-    if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL)) {
+    if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+    {
 #ifdef HAVE_SHIFTBBA
       if (rIsLPRing(currRing))
@@ -9610 +9617 @@
       if (strat->redTailChange)
         p.t_p=NULL;
+      if (strat->P.p!=NULL) strat->P.sev=p_GetShortExpVector(strat->P.p,currRing);
+      else strat->P.sev=0;
     }
   }
@@ -9622 +9631 @@
   enterT(p, strat);
 
-  for (j = 0; j <= strat->sl; ++j) {
-    if (pLtCmp(tp, strat->S[j]) == 0) {
+  for (j = 0; j <= strat->sl; ++j)
+  {
+    if (pLtCmp(tp, strat->S[j]) == 0)
+    {
       break;
     }
@@ -9629 +9640 @@
   /* it may be that the exchanged element
    * is until now only in T and not in S */
-  if (j <= strat->sl) {
+  if (j <= strat->sl)
+  {
     deleteInS(j, strat);
   }
@@ -9639 +9651 @@
 
   /* remove useless pairs from L set */
-  for (i = 0; i <= strat->Ll; ++i) {
-    if (strat->L[i].p1 != NULL && pLtCmp(tp, strat->L[i].p1) == 0) {
+  for (i = 0; i <= strat->Ll; ++i)
+  {
+    if (strat->L[i].p1 != NULL && pLtCmp(tp, strat->L[i].p1) == 0)
+    {
       deleteInL(strat->L, &(strat->Ll), i, strat);
       i--;
       continue;
     }
-    if (strat->L[i].p2 != NULL && pLtCmp(tp, strat->L[i].p2) == 0) {
+    if (strat->L[i].p2 != NULL && pLtCmp(tp, strat->L[i].p2) == 0)
+    {
       deleteInL(strat->L, &(strat->Ll), i, strat);
       i--;