Changeset ede2ad8 in git for kernel/GBEngine/kstd2.cc

Timestamp:

Aug 31, 2015, 3:57:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

fd07781d309b3cc6a9930e69e9c6b97aa93d73a4

Parents:

ef573fff51417c61e82c8176e0679f71fb732c40

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-31 15:57:59+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-08-31 16:01:57+02:00

Message:

fix tr. #712: std(SB,I) does not allow crit3 because of the (wrong) order of reductions

if size(I)*4 > 3*size(SB), use std(SB+I), otherwise disable crit3

File:

• kernel/GBEngine/kstd2.cc (modified) (4 diffs)

kernel/GBEngine/kstd2.cc

@@ -1228 +1228 @@
 #endif
 #ifdef KDEBUG
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("redNF: starting S: ");
-    for( j = 0; j <= max_ind; j++ )
-    {
-      Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-      pWrite(strat->S[j]);
-    }
-  };
+//  if (TEST_OPT_DEBUG)
+//  {
+//    PrintS("redNF: starting S:\n");
+//    for( j = 0; j <= max_ind; j++ )
+//    {
+//      Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
+//      pWrite(strat->S[j]);
+//    }
+//  };
 #endif
 
@@ -1304 +1304 @@
 
 #ifdef KDEBUG
-        if (TEST_OPT_DEBUG)
-        {
-          PrintS("redNF: starting S: ");
-          for( j = 0; j <= max_ind; j++ )
-          {
-            Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-            pWrite(strat->S[j]);
-          }
-        };
+//        if (TEST_OPT_DEBUG)
+//        {
+//          PrintS("redNF: starting S:\n");
+//          for( j = 0; j <= max_ind; j++ )
+//          {
+//            Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
+//            pWrite(strat->S[j]);
+//          }
+//        };
 #endif
 
@@ -1337 +1337 @@
 
 #ifdef KDEBUG
-      if (TEST_OPT_DEBUG)
-      {
-        PrintS("redNF: starting S: ");
-        for( j = 0; j <= max_ind; j++ )
-        {
-          Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
-          pWrite(strat->S[j]);
-        }
-      };
+//      if (TEST_OPT_DEBUG)
+//      {
+//        PrintS("redNF: starting S:\n");
+//        for( j = 0; j <= max_ind; j++ )
+//        {
+//          Print("S[%d] (of size: %d): ", j, pSize(strat->S[j]));
+//          pWrite(strat->S[j]);
+//        }
+//      };
 #endif
 
@@ -1688 +1688 @@
 //    }
 //  }
-  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
+  if ((TEST_OPT_PROT) || (TEST_OPT_DEBUG)) messageStat(hilbcount,strat);
   SI_RESTORE_OPT1(save);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);