Changeset 15b211 in git

Timestamp:

Nov 21, 2013, 6:42:17 PM (9 years ago)

Author:

Christian Eder

Branches:

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

Children:

f59aaade492b9527e048de83ffcb97228e48208b

Parents:

f1babfbabc0fc2906b36df32051eaaf09673dc6f

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-21 18:42:17+01:00

git-committer:

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

Message:

1. adds operation counting in sba
2. enables partial tailred for incremental sba

File:

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

kernel/kstd2.cc

@@ -48 +48 @@
 #endif
 
-#define F5C       0
+#define F5C       1
 #if F5C
   #define F5CTAILRED 1
@@ -56 +56 @@
 #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
@@ -61 +62 @@
 
 long sba_reduction_steps;
+long sba_operations;
 /***********************************************
  * SBA stuff -- done
@@ -623 +625 @@
     sigSafe = ksReducePolySig(h, &(strat->T[ii]), strat->S_2_R[ii], NULL, NULL, strat);
 #if SBA_PRINT_REDUCTION_STEPS
-    sba_reduction_steps++;
+    if (sigSafe != 3)
+      sba_reduction_steps++;
+#endif
+#if SBA_PRINT_OPERATIONS
+    if (sigSafe != 3)
+      sba_operations  +=  pLength(strat->T[ii].p);
 #endif
     // if reduction has taken place, i.e. the reduction was sig-safe
@@ -1514 +1521 @@
   // global variable
   sba_reduction_steps     = 0;
+  sba_operations          = 0;
 
   ideal F = F0;
@@ -1540 +1548 @@
   int hilbeledeg=1,hilbcount=0,minimcnt=0;
   LObject L;
-  // BOOLEAN withT     = FALSE;
+  BOOLEAN withT     = FALSE;
   strat->max_lower_index = 0;
 
@@ -2066 +2074 @@
   printf("TOP S-REDUCTIONS:  %ld\n",sba_reduction_steps);
 #endif
+#if SBA_OPERATIONS
+  printf("OPERATIONS:        %ld\n",sba_operations);
+#endif
 #if SBA_PRINT_SIZE_G
   printf("SIZE OF G:         %ld\n",size_g);
@@ -2080 +2091 @@
   product_criterion   = 0;
   sba_reduction_steps = 0;
+  sba_operations      = 0;
   return (strat->Shdl);
 }
@@ -2402 +2414 @@
       // therefore we call pContent instead of pNorm
 #if F5CTAILRED
+      BOOLEAN withT = TRUE;
       if ((TEST_OPT_INTSTRATEGY) || (rField_is_Ring(currRing)))
       {