Changeset b085fba in git for kernel/kstd2.cc

Timestamp:

Nov 25, 2013, 9:15:32 AM (9 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

576f5bba463748c5f51eebf368f6184847882508

Parents:

f59aaade492b9527e048de83ffcb97228e48208b

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-25 09:15:32+01:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:25+01:00

Message:

adds experimental sba tailred (disabled by default)

File:

• kernel/kstd2.cc (modified) (5 diffs)

kernel/kstd2.cc

@@ -53 +53 @@
 #endif
 
+#define SBA_TAIL_RED                        0
 #define SBA_PRODUCT_CRITERION               0
 #define SBA_PRINT_ZERO_REDUCTIONS           1
@@ -1818 +1819 @@
       // in the ring case we cannot expect LC(f) = 1,
       // therefore we call pContent instead of pNorm
-      /*
+#if SBA_TAIL_RED
+      pWrite(strat->P.p);
       if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
       {
@@ -1824 +1826 @@
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
         {
-          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
+          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
           strat->P.pCleardenom();
         }
@@ -1832 +1834 @@
         strat->P.pNorm();
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-          strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
-      }
-      */
+          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+      }
+      pWrite(strat->P.p);
+      printf("-\n");
+#endif
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
@@ -1934 +1938 @@
       // posInS only depends on the leading term
       strat->enterS(strat->P, pos, strat, strat->tl);
-//#if 1
-#if DEBUGF50
+#if 1
+//#if DEBUGF50
     printf("---------------------------\n");
     Print(" %d. ELEMENT ADDED TO GCURR:\n",strat->sl+1);