Changeset e702ac2 in git for kernel/kstd2.cc

Timestamp:

Dec 3, 2013, 8:31:38 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

88bb8861e1718d85807ce45f043eba5c778545e1

Parents:

9c07fe126bfeead6b8df47d1c2efa3d63d6e78c5

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-03 20:31:38+01:00

git-committer:

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

Message:

fixes problems with TOP sba computations

File:

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

kernel/kstd2.cc

@@ -55 +55 @@
 #define SBA_TAIL_RED                        1
 #define SBA_PRODUCT_CRITERION               0
-#define SBA_PRINT_ZERO_REDUCTIONS           0
-#define SBA_PRINT_REDUCTION_STEPS           0
-#define SBA_PRINT_OPERATIONS                0
-#define SBA_PRINT_SIZE_G                    0
-#define SBA_PRINT_SIZE_SYZ                  0
+#define SBA_PRINT_ZERO_REDUCTIONS           1
+#define SBA_PRINT_REDUCTION_STEPS           1
+#define SBA_PRINT_OPERATIONS                1
+#define SBA_PRINT_SIZE_G                    1
+#define SBA_PRINT_SIZE_SYZ                  1
 #define SBA_PRINT_PRODUCT_CRITERION         0
 
@@ -1791 +1791 @@
     #endif
     if (strat->Ll== 0) strat->interpt=TRUE;
+    /*
     if (TEST_OPT_DEGBOUND
         && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
             || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     {
-      /*
-       *stops computation if
-       * 24 IN test and the degree +ecart of L[strat->Ll] is bigger then
-       *a predefined number Kstd1_deg
-       */
+      
+       //stops computation if
+       // 24 IN test and the degree +ecart of L[strat->Ll] is bigger then
+       //a predefined number Kstd1_deg
       while ((strat->Ll >= 0)
         && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
@@ -1809 +1809 @@
       else strat->noClearS=TRUE;
     }
+    */
     if (strat->sbaOrder == 1 && pGetComp(strat->L[strat->Ll].sig) != strat->currIdx)
     {
@@ -1829 +1830 @@
     strat->Ll--;
     /* reduction of the element choosen from L */
+
     if (!strat->rewCrit2(strat->P.sig, ~strat->P.sevSig, strat, strat->P.checked+1)) {
       //#if 1
@@ -1843 +1845 @@
       {
         // deletes the short spoly
+        /*
 #ifdef HAVE_RINGS
         if (rField_is_Ring(currRing))
@@ -1849 +1852 @@
 #endif
           pLmFree(strat->P.p);
-
-        // TODO: needs some masking
-        // TODO: masking needs to vanish once the signature
-        //       sutff is completely implemented
-        strat->P.p = NULL;
+*/
+          // TODO: needs some masking
+          // TODO: masking needs to vanish once the signature
+          //       sutff is completely implemented
+          strat->P.p = NULL;
         poly m1 = NULL, m2 = NULL;
 
@@ -1881 +1884 @@
         strat->P.PrepareRed(strat->use_buckets);
       }
-
       if (strat->P.p == NULL && strat->P.t_p == NULL)
       {
@@ -1888 +1890 @@
       else
       {
-
         //#if 1
 #ifdef DEBUGF5
@@ -1910 +1911 @@
       }
     } else {
-        red_result = 2;
-      }
-      if (errorreported)  break;
+      /*
+      if (strat->P.lcm != NULL)
+        pLmFree(strat->P.lcm);
+        */
+      red_result = 2;
+    }
+    if (errorreported)  break;
+
+//#if 1
+#ifdef DEBUGF5
+    if (red_result != 0) {
+        Print("Poly after red: ");
+        pWrite(pHead(strat->P.p));
+        pWrite(strat->P.GetLmCurrRing());
+        pWrite(strat->P.sig);
+        printf("%d\n",red_result);
+    }
+#endif
 
     if (strat->overflow)
@@ -1951 +1967 @@
       // therefore we call pContent instead of pNorm
 #if SBA_TAIL_RED
-      if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
-      {
-        strat->P.pCleardenom();
-        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-        {
-          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+      if (strat->sbaOrder != 2) {
+        if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
+        {
           strat->P.pCleardenom();
-        }
-      }
-      else
-      {
-        strat->P.pNorm();
-        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
-          strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+          if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+          {
+            strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+            strat->P.pCleardenom();
+          }
+        }
+        else
+        {
+          strat->P.pNorm();
+          if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+            strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
+        }
       }
 #endif
@@ -2020 +2038 @@
       enterT(strat->P, strat);
       strat->T[strat->tl].is_sigsafe = FALSE;
+      /*
+      printf("hier\n");
+      pWrite(strat->P.GetLmCurrRing());
+      pWrite(strat->P.sig);
+      */
 #ifdef HAVE_RINGS
       if (rField_is_Ring(currRing))