Changeset 576f5b in git

Timestamp:

Nov 25, 2013, 4:57:13 PM (9 years ago)

Author:

Christian Eder

Branches:

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

Children:

c91ffe336985180edd91ef17bf401793443ccb4d

Parents:

b085fbae2501ff545f48d2d74ab896e6c2343f5b

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-25 16:57:13+01:00

git-committer:

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

Message:

workin sba tail reduction (disabled by default)

Location:

kernel

Files:

• kInline.h (modified) (1 diff)
• kspoly.cc (modified) (1 diff)
• kstd2.cc (modified) (5 diffs)

kernel/kInline.h

@@ -1081 +1081 @@
   assume(PR->GetLmCurrRing() != PW->GetLmCurrRing());
   Red->HeadNormalize();
+  /*
   printf("------------------------\n");
   pWrite(Red->GetLmCurrRing());
+  */
   ret = ksReducePolySig(Red, PW, 1, NULL, &coef);
-  if (ret == 3) {
-    pWrite(Red->GetLmCurrRing());
-    printf("not sig-safe\n");
-    printf("------------------------\n");
-  }
   if (!ret)
   {

kernel/kspoly.cc

@@ -262 +262 @@
       return 3;
     }
-    PW->is_sigsafe  = TRUE;
+    //PW->is_sigsafe  = TRUE;
   }
   PR->is_redundant = FALSE;

kernel/kstd2.cc

@@ -1576 +1576 @@
   int hilbeledeg=1,hilbcount=0,minimcnt=0;
   LObject L;
-  BOOLEAN withT     = FALSE;
+  BOOLEAN withT     = TRUE;
   strat->max_lower_index = 0;
 
@@ -1770 +1770 @@
         if (!kStratChangeTailRing(strat)) { Werror("OVERFLOW.."); break;}
     }
-    if (strat->incremental)
-    {
-      for (int jj = 0; jj<strat->tl+1; jj++)
-      {
-        if (pGetComp(strat->T[jj].sig) == strat->currIdx)
-        {
-          strat->T[jj].is_sigsafe = FALSE;
-        }
-      }
-    }
-    else
-    {
-      for (int jj = 0; jj<strat->tl+1; jj++)
-      {
-        strat->T[jj].is_sigsafe = FALSE;
-      }
-    }
 
     // reduction to non-zero new poly
@@ -1820 +1803 @@
       // therefore we call pContent instead of pNorm
 #if SBA_TAIL_RED
-      pWrite(strat->P.p);
       if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
       {
@@ -1836 +1818 @@
           strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
       }
-      pWrite(strat->P.p);
-      printf("-\n");
-#endif
+#endif
+
+    // remove sigsafe label since it is no longer valid for the next element to
+    // be reduced
+    if (strat->incremental)
+    {
+      for (int jj = 0; jj<strat->tl+1; jj++)
+      {
+        if (pGetComp(strat->T[jj].sig) == strat->currIdx)
+        {
+          strat->T[jj].is_sigsafe = FALSE;
+        }
+      }
+    }
+    else
+    {
+      for (int jj = 0; jj<strat->tl+1; jj++)
+      {
+        strat->T[jj].is_sigsafe = FALSE;
+      }
+    }
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
@@ -1938 +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);