Changeset 3a961a in git

Timestamp:

Jul 5, 2018, 9:54:56 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f6737053e8a61a659306021d5ac217163169d724

Parents:

c0632a415538219793d1d2b77ce38c37fcaf35f7

Message:

SHIFT_MULT_COMPAT_MODE is ready to be disabled now

Files:

• kernel/GBEngine/kspoly.cc (modified) (3 diffs)
• libpolys/polys/shiftop.cc (modified) (3 diffs)

kernel/GBEngine/kspoly.cc

@@ -788 +788 @@
   if (tailRing->isLPring)
   {
-    int split = p_FirstVblock(p1, tailRing);
+    // note: because of the crits, p2 is never shifted
+    int split = p_mFirstVblock(p1, tailRing);
     // TODO: shouldn't we use p1 AND p2 here??
     k_SplitFrame(m1, m12, split, tailRing);
@@ -795 +796 @@
     n_Delete(&(m1->coef), tailRing->cf);
     n_Delete(&(m2->coef), tailRing->cf);
+
+    a1 = p_LPshift(p_Copy(a1, tailRing), 1 - split, tailRing); // unshift a1
   }
 
@@ -842 +845 @@
   if (tailRing->isLPring) {
     // get m2*a2*m22 - m1*a1*m12
-    Pair->Tail_Minus_mm_Mult_qq(m1, tailRing->p_Procs->pp_Mult_mm(a1, m12, tailRing), l1, spNoether);
+    Pair->Tail_Minus_mm_Mult_qq(m1, tailRing->p_Procs->p_Mult_mm(a1, m12, tailRing), l1, spNoether); // a1 is a copy: safe to destroy
   } else {
     // get m2*a2 - m1*a1

libpolys/polys/shiftop.cc

@@ -94 +94 @@
   p_LPUnShift(p, ri);
 #else
-  assume(p_mFirstVblock(_m, lV, ri) <= 1);
-  assume(p_FirstVblock(p, lV, ri) <= 1); // TODO check that each block is <=1
+  assume(p_mFirstVblock(_m, ri) <= 1);
+  assume(p_FirstVblock(p, ri) <= 1); // TODO check that each block is <=1
 #endif
   // at this point _m and p are shifted to 1
@@ -154 +154 @@
   p_LPUnShift(p, ri);
 #else
-  assume(p_mFirstVblock(_m, lV, ri) <= 1);
-  assume(p_FirstVblock(p, lV, ri) <= 1); // TODO check that each block is <=1
+  assume(p_mFirstVblock(_m, ri) <= 1);
+  assume(p_FirstVblock(p, ri) <= 1); // TODO check that each block is <=1
 #endif
   // at this point _m and p are shifted to 1
@@ -217 +217 @@
   p_LPUnShift(p, ri);
 #else
-  assume(p_mFirstVblock(_m, lV, ri) <= 1);
-  assume(p_FirstVblock(p, lV, ri) <= 1); // TODO check that each block is <=1
+  assume(p_mFirstVblock(_m, ri) <= 1);
+  assume(p_FirstVblock(p, ri) <= 1); // TODO check that each block is <=1
 #endif
   // at this point _m and p are shifted to 1