Changeset 15fbfe0 in git for kernel/GBEngine/kstd2.cc

Timestamp:

Nov 23, 2018, 9:57:32 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b95a5fd690d6e706af819dfdf1070a990219bf41

Parents:

6b0b41353343d43decc1e6b69445b44cca8cd850352a92c88d03b3b9cf5dcabdeb7619670ccc7228

Message:

Merge branch 'spielwiese' into rightGB

File:

• kernel/GBEngine/kstd2.cc (modified) (4 diffs)

kernel/GBEngine/kstd2.cc

@@ -3522 +3522 @@
   initBuchMoraCrit(strat);
   strat->initEcart = initEcartBBA;
-  strat->enterS = enterSBba;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    strat->enterS = enterSBbaShift;
+  }
+  else
+#endif
+  {
+    strat->enterS = enterSBba;
+  }
 #ifndef NO_BUCKETS
   strat->use_buckets = (!TEST_OPT_NOT_BUCKETS) && (!rIsPluralRing(currRing));
@@ -3564 +3573 @@
   omfree(strat->S_2_R);
   omfree(strat->fromQ);
+#ifdef HAVE_SHIFTBBA
+  // only LM of elements in S is shifted
+  // necessary to prevent deleting the tail multiple times
+  if (rIsLPRing(currRing))
+  {
+    for (int j = 0; j < IDELEMS(strat->Shdl); j++)
+    {
+      if (strat->Shdl->m[j]!=NULL && pmFirstVblock(strat->Shdl->m[j]) > 1)
+      {
+        // otherwise the tail would be freed multiple times
+        pNext(strat->Shdl->m[j]) = NULL;
+      }
+    }
+  }
+#endif
   idDelete(&strat->Shdl);
   SI_RESTORE_OPT1(save1);
@@ -3665 +3689 @@
   initBuchMoraCrit(strat);
   strat->initEcart = initEcartBBA;
-  strat->enterS = enterSBba;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    strat->enterS = enterSBbaShift;
+  }
+  else
+#endif
+  {
+    strat->enterS = enterSBba;
+  }
   /*- set S -*/
   strat->sl = -1;
@@ -3709 +3742 @@
   omfree(strat->S_2_R);
   omfree(strat->fromQ);
+#ifdef HAVE_SHIFTBBA
+  // only LM of elements in S is shifted
+  // necessary to prevent deleting the tail multiple times
+  if (rIsLPRing(currRing))
+  {
+    for (int j = 0; j < IDELEMS(strat->Shdl); j++)
+    {
+      if (strat->Shdl->m[j]!=NULL && pmFirstVblock(strat->Shdl->m[j]) > 1)
+      {
+        // otherwise the tail would be freed multiple times
+        pNext(strat->Shdl->m[j]) = NULL;
+      }
+    }
+  }
+#endif
   idDelete(&strat->Shdl);
   SI_RESTORE_OPT1(save1);