Changeset c0632a4 in git

Timestamp:

Jul 5, 2018, 9:02:32 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3a961a3f6d0a9dd9edd07a18ca373384df3a221c

Parents:

216e128447d274610a03d71c71d03d4e7d330814

Message:

the tail of shifted polys in T is now the tail of the unshifted poly

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (12 diffs)
• kutil.cc (modified) (6 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kspoly.cc

@@ -96 +96 @@
 #endif
 
-  if (tailRing->isLPring && t2 == NULL && PW->pUnshifted != NULL) {
-      t2 = pNext(PW->pUnshifted);
-  }
-
   if (t2==NULL)           // Divisor is just one term, therefore it will
   {                       // just cancel the leading term
@@ -108 +104 @@
 
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
-
-  poly lmRight;
-  if (tailRing->isLPring) {
-    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
-  } // the while loop below won't be executed for letterplace
 
   //if (tailRing != currRing)
@@ -133 +124 @@
   }
 
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
+  }
+
   // take care of coef buisness
   if (! n_IsOne(pGetCoeff(p2), tailRing->cf))
@@ -227 +223 @@
 #endif
 
-  if (tailRing->isLPring && t2 == NULL && PW->pUnshifted != NULL) {
-      t2 = pNext(PW->pUnshifted);
-  }
-
   if (t2==NULL)           // Divisor is just one term, therefore it will
   {                       // just cancel the leading term
@@ -239 +231 @@
 
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
-
-  poly lmRight;
-  if (tailRing->isLPring) {
-    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
-  } // the while loop below won't be executed for letterplace
 
   if (tailRing != currRing)
@@ -262 +249 @@
       ret = 1;
     }
+  }
+
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
   }
 
@@ -432 +424 @@
 #endif
 
-  if (tailRing->isLPring && t2 == NULL && PW->pUnshifted != NULL) {
-      t2 = pNext(PW->pUnshifted);
-  }
-
   if (t2==NULL)           // Divisor is just one term, therefore it will
   {                       // just cancel the leading term
@@ -444 +432 @@
 
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
-
-  poly lmRight;
-  if (tailRing->isLPring) {
-    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
-  } // the while loop below won't be executed for letterplace
 
   if (tailRing != currRing)
@@ -467 +450 @@
       ret = 1;
     }
+  }
+
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
   }
 
@@ -670 +658 @@
 #endif
 
-  if (tailRing->isLPring && t2 == NULL && PW->pUnshifted != NULL) {
-      t2 = pNext(PW->pUnshifted);
-  }
-
   if (t2==NULL)           // Divisor is just one term, therefore it will
   {                       // just cancel the leading term
@@ -682 +666 @@
 
   p_ExpVectorSub(lm, p2, tailRing); // Calculate the Monomial we must multiply to p2
-
-  poly lmRight;
-  if (tailRing->isLPring) {
-    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
-  } // the while loop below won't be executed for letterplace
 
   if (tailRing != currRing)
@@ -705 +684 @@
       ret = 1;
     }
+  }
+
+  poly lmRight;
+  if (tailRing->isLPring) {
+    k_SplitFrame(lm, lmRight, PW->shift + 1, tailRing);
   }
 

kernel/GBEngine/kutil.cc

@@ -566 +566 @@
         else
         {
+          if (currRing->isLPring && strat->T[j].shift > 0) {
+            pNext(p) = NULL; // pNext(p) points to the unshifted tail, don't try to delete it here
+          }
           pDelete(&p);
         }
@@ -822 +825 @@
     if (T->p == NULL && i > 0)
       return dReportError("%c[%d].p is NULL", TN, i);
-    pFalseReturn(p_Test(T->p, currRing));
+    if (currRing->isLPring && T->shift > 0) {
+      // in this case, the order is not correct. test LM and tail separately
+      pFalseReturn(p_LmTest(T->p, currRing));
+      pFalseReturn(p_Test(pNext(T->p), currRing));
+    } else {
+      pFalseReturn(p_Test(T->p, currRing));
+    }
   }
 
@@ -9277 +9286 @@
   int i;
 
-  pp_Test(p.p, currRing, p.tailRing);
+#ifdef PDEBUG
+  if (currRing->isLPring && p.shift > 0) {
+    // in this case, the order is not correct. test LM and tail separately
+    p_LmTest(p.p, currRing);
+    p_Test(pNext(p.p), currRing);
+  } else {
+    pp_Test(p.p, currRing, p.tailRing);
+  }
+#endif
   assume(strat->tailRing == p.tailRing);
   // redMoraNF complains about this -- but, we don't really
@@ -9326 +9343 @@
   }
 
-  if ((strat->tailBin != NULL) && (pNext(p.p) != NULL))
+  // letterplace: if p.shift > 0 then pNext(p.p) is already in the tailBin
+  if ((strat->tailBin != NULL) && (pNext(p.p) != NULL) && !(currRing->isLPring && p.shift > 0))
   {
     pNext(p.p)=p_ShallowCopyDelete(pNext(p.p),
@@ -12501 +12519 @@
 #ifdef HAVE_SHIFTBBA
 /*2
-* puts p to the set T, starting with the at position atT
-* and inserts all admissible shifts of p
+* enteres all admissible shifts of p into T
+* assumes that p is already in T!
 */
 void enterTShift(LObject p, kStrategy strat, int atT)
@@ -12514 +12532 @@
   int toInsert = itoInsert(p.p, strat->tailRing);
 
-  poly shifted;
   for (int i = 1; i <= toInsert; i++)
   {
-    shifted = p_mLPshift(p_Head(p.p, currRing), i, currRing);
-    LObject qq(shifted);
-    qq.SetpFDeg();
-    qq.SetShortExpVector();
+    poly shifted = p_mLPshift(p_Head(p.p, currRing), i, currRing);
+    pNext(shifted) = pNext(p.p);
+    LObject qq;
+    qq.p = shifted; // don't use Set() because it'll test the poly order
     qq.shift = i;
-    qq.pUnshifted = pNext(p.p);
-    strat->initEcart(&qq);
-    qq.ecart = p.ecart;
-    #ifdef KTEST
-    kTest_T(&qq, strat->tailRing, -1, 'L');
-    #endif
-    /* enter it into T, first el't is with the shift 0 */
-    enterT(qq, strat, atT);
+    strat->initEcart(&qq); // initEcartBBA sets length, pLength, FDeg and ecart
+
+    enterT(qq, strat, atT); // enterT is modified, so it doesn't copy and delete the tail of shifted polys
   }
 }

kernel/GBEngine/kutil.h

@@ -96 +96 @@
   // letterplace
   int shift;
-  poly pUnshifted;
 
   // initialization