Changeset 780e11 in git for kernel/kstd1.cc

Timestamp:

Oct 19, 2011, 4:47:55 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b304ba2d40702a4f469ed9a2270027d1188c0c75

Parents:

1327a0002c1e1e8edbf06eba651a4e39a3a26c9d

Message:

fix tr. 255


git-svn-id: file:///usr/local/Singular/svn/trunk@14420 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/kstd1.cc (modified) (4 diffs)

kernel/kstd1.cc

@@ -2315 +2315 @@
   strat->posInL=posInL0; /* ord according pComp */
 
-  /*Shdl=*/initBuchMora(F, Q,strat);
+  /*Shdl=*/initBuchMora(F, Q, strat);
   srmax = strat->sl;
   reduc = olddeg = lrmax = 0;
@@ -2469 +2469 @@
 
 #ifdef KDEBUG
-    messageSets(strat);
+    if (TEST_OPT_DEBUG)
+    {
+      messageSets(strat);
+    }
     memset(&(strat->P), 0, sizeof(strat->P));
 #endif
@@ -2537 +2540 @@
   int need_retry;
   int counter=3;
-  int elems=idElem(F);
-  ideal res=kInterRedBba(F,Q,need_retry);
+  ideal res, res1;
+  int elems;
+  ideal null=NULL;
+  if ((Q==NULL) || (!TEST_OPT_REDSB))
+  {
+    elems=idElem(F);
+    res=kInterRedBba(F,Q,need_retry);
+  }
+  else
+  {
+    ideal FF=idSimpleAdd(F,Q);
+    res=kInterRedBba(FF,NULL,need_retry);
+    idDelete(&FF);
+    null=idInit(1,1);
+    res1=kNF(null,Q,res);
+    idDelete(&res);
+    res=res1;
+  }
   while (need_retry && (counter>0))
   {
@@ -2544 +2563 @@
     if (TEST_OPT_DEBUG) { Print("retry counter %d\n",counter); }
     #endif
-    ideal res1=kInterRedBba(res,Q,need_retry);
+    res1=kInterRedBba(res,Q,need_retry);
     int new_elems=idElem(res1);
     counter -= (new_elems >= elems);
     elems = new_elems;
     idDelete(&res);
-    res = res1;
-  }
+    if ((Q!=NULL) && (TEST_OPT_REDSB))
+    {
+      res=kNF(null,Q,res1);
+      idDelete(&res1);
+    }
+    else
+      res = res1;
+  }
+  if (null!=NULL) idDelete(&null);
   test=save;
   idSkipZeroes(res);
   return res;
 }
-
 
 // returns TRUE if mora should use buckets, false otherwise