Changeset 08b6c4 in git

Timestamp:

Dec 24, 2019, 3:00:50 PM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

b1bc248d073584573806dd68ddc187158bf5c279

Parents:

096b8ab36ab29f6898e7739f784f9219646ca413

Message:

Fix lpZ for qring

File:

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

kernel/GBEngine/kutil.cc

@@ -12767 +12767 @@
   if (rField_is_Ring(currRing))
   {
-    assume(q_shift <= p_lastVblock);
+    assume(q_shift <= p_lastVblock); // we allow the special case where there is no overlap
     enterOneStrongPolyAndEnterOnePairRingShift(q, p, ecartp, p_isFromQ, strat, -1, ecartq, q_isFromQ, q_shift, -1);
   }
@@ -12773 +12773 @@
 #endif
   {
-    int maxNeededShift = p_lastVblock - 1;
-    assume(q_shift <= maxNeededShift);
+    assume(q_shift <= p_lastVblock - 1); // there should be an overlap
     enterOnePairShift(q, p, ecartp, p_isFromQ, strat, -1, ecartq, q_isFromQ, q_shift, -1);
   }
@@ -13198 +13197 @@
               {
                 poly s = strat->S[j];
-                enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, pmLastVblock(s), i);
+                int s_lastVblock = pmLastVblock(s);
+                if (i < s_lastVblock)
+                  enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, s_lastVblock, i);
+#ifdef HAVE_RINGS
+                else if (rField_is_Ring(currRing))
+                {
+                  assume(i >= s_lastVblock); // this is always the case, but just to be very sure
+                  ideal fillers = id_MaxIdeal(i - s_lastVblock, currRing);
+                  for (int k = 0; k < IDELEMS(fillers); k++)
+                  {
+                    poly hhh = pLPCopyAndShiftLM(pp_mm_Mult(h, fillers->m[k], currRing), s_lastVblock);
+                    enterOnePairWithoutShifts(j, hhh, s, ecart, isFromQ, strat, atR, s_lastVblock, s_lastVblock);
+                  }
+                  idDelete(&fillers);
+                }
+#endif
               }
             }
@@ -13210 +13224 @@
         for (j=0; j<=k; j++) {
           poly s = strat->S[j];
-          // TODO: cache lastVblock of s[1..k] for later use
           enterOnePairWithShifts(j, s, h, ecart, isFromQ, strat, atR, h_lastVblock, pmLastVblock(s));
         }
@@ -13257 +13270 @@
     else
     {
+      assume(isFromQ == 0); // an element from Q should always has 0 component
       new_pair=TRUE;
       if (strat->rightGB)
@@ -13265 +13279 @@
               || (pGetComp(strat->S[j])==0))
           {
-            assume(isFromQ == 0); // this case is not handeled here and should also never happen
             poly s = strat->S[j];
             if (strat->fromQ != NULL && strat->fromQ[j])