Changeset b3e94aa in git for kernel/kstd2.cc

Timestamp:

Nov 12, 2013, 1:42:25 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f9d20d729f6b8b9238916f0b834dcae5c1a763c3

Parents:

5313c099cf9db0abd520c21bc971ae22d8b655fd

git-author:

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

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 14:58:02+01:00

Message:

1. implements usage of product criterion in sba
   (disabled by default, still experimental)
2. adds more detailed debugging printouts for sba
   (disabled by default)

File:

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

kernel/kstd2.cc

@@ -37 +37 @@
 #endif
 
+/***********************************************
+ * SBA stuff -- start
+***********************************************/
 #define DEBUGF50  0
 #define DEBUGF51  0
@@ -45 +48 @@
 #endif
 
-#define F5C       1
+#define F5C       0
 #if F5C
   #define F5CTAILRED 0
 #endif
+
+#define SBA_PRODUCT_CRITERION         0
+#define SBA_PRINT_ZERO_REDUCTIONS     0
+#define SBA_PRINT_SIZE_G              0
+#define SBA_PRINT_SIZE_SYZ            0
+#define SBA_PRINT_PRODUCT_CRITERION   0
+/***********************************************
+ * SBA stuff -- done
+***********************************************/
 
 #include <kernel/kutil.h>
@@ -1490 +1502 @@
   // The corresponding orders are computed in sbaRing(), depending
   // on the flag strat->incremental
+  long zeroreductions     = 0;
+  long product_criterion  = 0;
+  long size_g             = 0;
+  long size_syz           = 0;
+
   ideal F = F0;
   ring sRing, currRingOld;
@@ -1514 +1531 @@
   int   olddeg,reduc;
   int hilbeledeg=1,hilbcount=0,minimcnt=0;
-  long zeroreductions = 0;
   LObject L;
   // BOOLEAN withT     = FALSE;
@@ -1684 +1700 @@
 #endif
       /* reduction of the element choosen from L */
-      if (!strat->rewCrit2(strat->P.sig, ~strat->P.sevSig, strat, strat->P.checked+1))
-        red_result = strat->red(&strat->P,strat);
-      else
-      {
+      if (!strat->rewCrit2(strat->P.sig, ~strat->P.sevSig, strat, strat->P.checked+1)) {
+#if SBA_PRODUCT_CRITERION
+        if (strat->P.checked == 3) {
+          product_criterion++;
+          enterSyz(strat->P, strat);
+          if (strat->P.lcm!=NULL)
+            pLmFree(strat->P.lcm);
+          red_result = 2;
+        } else {
+          red_result = strat->red(&strat->P,strat);
+        }
+#else
+      red_result = strat->red(&strat->P,strat);
+#endif
+      } else {
         if (strat->P.lcm!=NULL)
           pLmFree(strat->P.lcm);
@@ -1971 +1998 @@
   else if (TEST_OPT_PROT) PrintLn();
 
+#if SBA_PRINT_SIZE_G
+  size_g   = strat->sl+1;
+#endif
+#if SBA_PRINT_SIZE_SYZ
+  size_syz = strat->syzl+1;
+#endif
+
   exitSba(strat);
 //  if (TEST_OPT_WEIGHTM)
@@ -2018 +2052 @@
   }
 #endif
-  printf("ZERO REDUCTIONS: %ld\n",zeroreductions);
-  zeroreductions  = 0;
+#if SBA_PRINT_ZERO_REDUCTIONS
+  printf("ZERO REDUCTIONS:   %ld\n",zeroreductions);
+#endif
+#if SBA_PRINT_SIZE_G
+  printf("SIZE OF G:         %ld\n",size_g);
+#endif
+#if SBA_PRINT_SIZE_SYZ
+  printf("SIZE OF SYZ:       %ld\n",size_syz);
+#endif
+#if SBA_PRINT_PRODUCT_CRITERION
+  printf("PRODUCT CRITERIA:  %ld\n",product_criterion);
+#endif
+  zeroreductions    = 0;
+  size_g            = 0;
+  size_syz          = 0;
+  product_criterion = 0;
   return (strat->Shdl);
 }