Changeset ede2ad8 in git for kernel/GBEngine/kutil.cc

Timestamp:

Aug 31, 2015, 3:57:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

fd07781d309b3cc6a9930e69e9c6b97aa93d73a4

Parents:

ef573fff51417c61e82c8176e0679f71fb732c40

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-31 15:57:59+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-31 16:01:57+02:00

Message:

fix tr. #712: std(SB,I) does not allow crit3 because of the (wrong) order of reductions

if size(I)*4 > 3*size(SB), use std(SB+I), otherwise disable crit3

File:

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

kernel/GBEngine/kutil.cc

@@ -2300 +2300 @@
   pLcm(p,strat->S[i],Lp.lcm);
   pSetm(Lp.lcm);
-  for(j = strat->Ll;j>=0;j--)
-  {
-    compare=pDivComp(strat->L[j].lcm,Lp.lcm);
-    if ((compare==1) || (pLmEqual(strat->L[j].lcm,Lp.lcm)))
-    {
-      //PrintS("c3-crit\n");
-      strat->c3++;
-      pLmFree(Lp.lcm);
-      return;
-    }
-    else if (compare ==-1)
-    {
-      //Print("c3-crit with L[%d]\n",j);
-      deleteInL(strat->L,&strat->Ll,j,strat);
-      strat->c3++;
-    }
-  }
   /*-  compute the short s-polynomial -*/
 
@@ -2620 +2603 @@
     }
   }
+}
+/*2
+*the pairset B of pairs of type (s[i],p) is complete now. It will be updated
+*without the chain-criterion in B and L and enters B to L
+*/
+void chainCritOpt_1 (poly,int,kStrategy strat)
+{
+  if (strat->pairtest!=NULL)
+  {
+    omFreeSize(strat->pairtest,(strat->sl+2)*sizeof(BOOLEAN));
+    strat->pairtest=NULL;
+  }
+  /*
+  *the elements of B enter L
+  */
+  kMergeBintoL(strat);
 }
 /*2
@@ -7564 +7563 @@
   strat->enterOnePair=enterOnePairNormal;
   strat->chainCrit=chainCritNormal;
+  if (TEST_OPT_SB_1)
+    strat->chainCrit=chainCritOpt_1;
 #ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
@@ -9077 +9078 @@
     else if (strat->initEcartPair==initEcartPairMora) PrintS("initEcartPairMora\n");
     else  Print("%p\n",(void*)strat->initEcartPair);
-  Print("homog=%d, LazyDegree=%d, LazyPass=%d, ak=%d,\n",
-         strat->homog, strat->LazyDegree,strat->LazyPass, strat->ak);
-  Print("honey=%d, sugarCrit=%d, Gebauer=%d, noTailReduction=%d, use_buckets=%d\n",
-         strat->honey,strat->sugarCrit,strat->Gebauer,strat->noTailReduction,strat->use_buckets);
+  PrintS("chainCrit: ");
+    if (strat->chainCrit==chainCritNormal) PrintS("chainCritNormal\n");
+    else if (strat->chainCrit==chainCritOpt_1) PrintS("chainCritOpt_1\n");
+    else  Print("%p\n",(void*)strat->chainCrit);
   Print("posInLDependsOnLength=%d\n",
          strat->posInLDependsOnLength);