Changeset 470125b in git for kernel/GBEngine/kutil.cc

Timestamp:

Oct 21, 2017, 4:36:59 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

eafad1bbcab7f4572ef04a53e0ed3b009d4cc466

Parents:

90e748412d86517c444a170ecbebbf9489c44e06

Message:

fix: TObject::pLength

File:

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

kernel/GBEngine/kutil.cc

@@ -7430 +7430 @@
     {
       T->Set(strat->S[j], r, strat->tailRing);
+      assume(T->GetpLength()==pLength(T->p != __null ? T->p : T->t_p));
       return T;
     }
@@ -7455 +7456 @@
             (ecart== LONG_MAX || ecart>= strat->ecartS[j]))
         {
+          t->pLength=pLength(t->t_p);
           return t;
         }
@@ -7464 +7466 @@
           if (p_LmDivisibleBy(t->t_p, p, r))
           {
+            t->pLength=pLength(t->t_p);
             return t;
           }
@@ -7484 +7487 @@
             (ecart== LONG_MAX || ecart>= strat->ecartS[j]) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r->cf))
         {
+          t->pLength=pLength(t->t_p);
           return t;
         }
@@ -7493 +7497 @@
           if (p_LmDivisibleBy(t->t_p, p, r) && n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r->cf))
           {
+            t->pLength=pLength(t->t_p);
             return t;
           }
@@ -7595 +7600 @@
 
   LObject Ln(pNext(h), strat->tailRing);
-  Ln.pLength = L->GetpLength() - 1;
+  Ln.GetpLength();
 
   pNext(h) = NULL;
-  if (L->p != NULL) pNext(L->p) = NULL;
+  if (L->p != NULL)
+  {
+    pNext(L->p) = NULL;
+    if (L->t_p != NULL) pNext(L->t_p) = NULL;
+  }
   L->pLength = 1;
 
@@ -7626 +7635 @@
         if (j < 0) break;
         With = &(strat->T[j]);
+        assume(With->GetpLength()==pLength(With->p != __null ? With->p : With->t_p));
       }
       else
@@ -7631 +7641 @@
         With = kFindDivisibleByInS_T(strat, end_pos, &Ln, &With_s);
         if (With == NULL) break;
+        assume(With->GetpLength()==pLength(With->p != __null ? With->p : With->t_p));
       }
       cnt--;