Changeset 124970 in git

Timestamp:

May 2, 2020, 11:22:27 AM (4 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

72c30369edc68da6cbab1a305ed752d2a847ec63

Parents:

9d58a7caf741db5e365f7257bd91048bb1bddf31

Message:

Fix prod crit for modules in LP

File:

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

kernel/GBEngine/kutil.cc

@@ -12789 +12789 @@
 
   int degbound = currRing->N/currRing->isLPring;
-  int neededShift = p_lastVblock - 1;
+  int neededShift = p_lastVblock - ((pGetComp(p) > 0 || pGetComp(q) > 0) ? 0 : 1); // in the module case, product criterion does not hold
   int maxPossibleShift = degbound - q_lastVblock;
   int maxShift = si_min(neededShift, maxPossibleShift);
@@ -12844 +12844 @@
 #endif
   {
-    assume(q_shift <= p_lastVblock - 1); // there should be an overlap
+    assume(q_shift <= p_lastVblock - ((pGetComp(q) > 0 || pGetComp(p) > 0) ? 0 : 1)); // there should be an overlap (in the module case epsilon overlap is also allowed)
     enterOnePairShift(q, p, ecartp, p_isFromQ, strat, -1, ecartq, q_isFromQ, q_shift, -1);
   }
@@ -13283 +13283 @@
                 poly s = strat->S[j];
                 int s_lastVblock = pmLastVblock(s);
-                if (i < s_lastVblock)
+                if (i < s_lastVblock || (pGetComp(s) > 0 && i == s_lastVblock)) // in the module case, product criterion does not hold (note: comp h is always zero here)
                   enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, s_lastVblock, i);
 #ifdef HAVE_RINGS
@@ -13320 +13320 @@
             poly s = strat->S[j];
             int s_lastVblock = pmLastVblock(s);
-            if (i < s_lastVblock)
+            if (i < s_lastVblock || (pGetComp(s) > 0 && i == s_lastVblock)) // in the module case, product criterion does not hold (note: comp h is always zero here)
               enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, s_lastVblock, i);
 #ifdef HAVE_RINGS
@@ -13336 +13336 @@
 #endif
           }
-          if (i < h_lastVblock)
+          if (i < h_lastVblock) // in the module case, product criterion does not hold (note: comp h is always zero here)
             enterOnePairWithoutShifts(-1, hh, h, ecart, isFromQ, strat, atR, h_lastVblock, i);
 #ifdef HAVE_RINGS
@@ -13383 +13383 @@
         // pairs (shifts(s[1..k]),h), (s[1..k],h)
         for (j=0; j<=k; j++)
-        {
+        {
           if ((pGetComp(h)==pGetComp(strat->S[j]))
               || (pGetComp(strat->S[j])==0))
@@ -13402 +13402 @@
               poly s = strat->S[j];
               int s_lastVblock = pmLastVblock(s);
-              if (i < s_lastVblock)
+              if (i <= s_lastVblock) // in the module case, product criterion does not hold
                 enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, s_lastVblock, i);
 #ifdef HAVE_RINGS
@@ -13419 +13419 @@
             }
           }
-          if (i < h_lastVblock)
+          if (i <= h_lastVblock) // in the module case, product criterion does not hold
             enterOnePairWithoutShifts(-1, hh, h, ecart, isFromQ, strat, atR, h_lastVblock, i);
 #ifdef HAVE_RINGS