Changeset 308e89 in git for kernel/GBEngine/kutil.cc

Timestamp:

Dec 4, 2018, 4:34:29 PM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

0f9a66a9eeed1c220023e0e344674bf38c5cca3c

Parents:

0d8474c9798429378aec577a8c711773955b699c

Message:

Pairs for rightGB

File:

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

kernel/GBEngine/kutil.cc

@@ -12610 +12610 @@
     if (pGetComp(h)==0)
     {
+      if (strat->rightGB)
+      {
+        if (isFromQ)
+        {
+          // pairs (shifts(h),s[1..k]), (h, s[1..k])
+          for (i=0; i<=maxShift; i++)
+          {
+            poly hh = pLPCopyAndShiftLM(h, i);
+            for (j=0; j<=k; j++)
+            {
+              if (strat->fromQ == NULL || !strat->fromQ[j])
+              {
+                new_pair=TRUE;
+                poly s = strat->S[j];
+                enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, pmLastVblock(s), i);
+              }
+            }
+          }
+        }
+        else
+        {
+          new_pair=TRUE;
+          for (j=0; j<=k; j++)
+          {
+            poly s = strat->S[j];
+            if (strat->fromQ != NULL && strat->fromQ[j])
+            {
+              // pairs (shifts(s[j]),h), (s[j],h)
+              enterOnePairWithShifts(j, s, h, ecart, isFromQ, strat, atR, h_lastVblock, pmLastVblock(s));
+            }
+            else
+            {
+              // pair (h, s[j])
+              enterOnePairWithoutShifts(j, h, s, ecart, isFromQ, strat, atR, pmLastVblock(s), 0);
+            }
+          }
+        }
+      }
       /* for Q!=NULL: build pairs (f,q),(f1,f2), but not (q1,q2)*/
-      if ((isFromQ)&&(strat->fromQ!=NULL))
+      else if ((isFromQ)&&(strat->fromQ!=NULL))
       {
         // pairs (shifts(s[1..k]),h), (s[1..k],h)
@@ -12664 +12702 @@
     {
       new_pair=TRUE;
-      // 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))
-        {
-          poly s = strat->S[j];
-          enterOnePairWithShifts(j, s, h, ecart, isFromQ, strat, atR, h_lastVblock, pmLastVblock(s));
-        }
-      }
-      // pairs (shifts(h),s[1..k]), (shifts(h), h)
-      for (i=1; i<=maxShift; i++)
-      {
-        poly hh = pLPCopyAndShiftLM(h, i);
+      if (strat->rightGB)
+      {
         for (j=0; j<=k; j++)
         {
           if ((pGetComp(h)==pGetComp(strat->S[j]))
-          || (pGetComp(strat->S[j])==0))
+              || (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])
+            {
+              // pairs (shifts(s[j]),h), (s[j],h)
+              enterOnePairWithShifts(j, s, h, ecart, isFromQ, strat, atR, h_lastVblock, pmLastVblock(s));
+            }
+            else
+            {
+              // pair (h, s[j])
+              enterOnePairWithoutShifts(j, h, s, ecart, isFromQ, strat, atR, pmLastVblock(s), 0);
+            }
+          }
+        }
+      }
+      else
+      {
+        // 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))
           {
             poly s = strat->S[j];
-            enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, pmLastVblock(s), i);
+            enterOnePairWithShifts(j, s, h, ecart, isFromQ, strat, atR, h_lastVblock, pmLastVblock(s));
           }
         }
-        enterOnePairWithoutShifts(-1, hh, h, ecart, isFromQ, strat, atR, h_lastVblock, i);
+        // pairs (shifts(h),s[1..k]), (shifts(h), h)
+        for (i=1; i<=maxShift; i++)
+        {
+          poly hh = pLPCopyAndShiftLM(h, i);
+          for (j=0; j<=k; j++)
+          {
+            if ((pGetComp(h)==pGetComp(strat->S[j]))
+                || (pGetComp(strat->S[j])==0))
+            {
+              poly s = strat->S[j];
+              enterOnePairWithoutShifts(j, hh, s, ecart, isFromQ, strat, atR, pmLastVblock(s), i);
+            }
+          }
+          enterOnePairWithoutShifts(-1, hh, h, ecart, isFromQ, strat, atR, h_lastVblock, i);
+        }
       }
     }
@@ -12721 +12784 @@
       if (j > k) break;
       // TODO this currently doesn't clear all possible elements because of commutative division
-      // for rightGB this is already correct
-      clearS(h,h_sev, &j,&k,strat);
+      if (!(strat->rightGB && strat->fromQ != NULL && strat->fromQ[j]))
+        clearS(h,h_sev, &j,&k,strat);
       j++;
     }