Changeset 08ab82 in git for kernel/kstd2.cc

Timestamp:

Nov 6, 2007, 5:30:20 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

894377fe1ce013f6a8373f81afd184a94478f653

Parents:

2cfd742d986a19d4e480155ffdcced30570493ee

Message:

*hannes: OPT_DEBUG


git-svn-id: file:///usr/local/Singular/svn/trunk@10383 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.55 2007-11-06 12:58:34 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.56 2007-11-06 16:30:20 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1037 +1037 @@
             pNorm(strat->S[j]);
             //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
-            sl=pSize(strat->S[j]);
-          }
+            sl=pSize(strat->S[j]);
+          }
           if (!nIsOne(pGetCoeff(strat->S[jj])))
           {
             pNorm(strat->S[jj]);
             //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
-            sll=pSize(strat->S[jj]);
-          }
-          if (sll<sl)
-          {
-            if (TEST_OPT_DEBUG) Print("better(S%d:%d -> S%d:%d)\n",j,sl,jj,sll);
+            sll=pSize(strat->S[jj]);
+          }
+          if (sll<sl)
+          {
+            #ifdef KDEBUG
+            if (TEST_OPT_DEBUG) Print("better(S%d:%d -> S%d:%d)\n",j,sl,jj,sll);
+            #endif
             //else if (TEST_OPT_PROT) { PrintS("b"); mflush(); }
             j=jj;
             sl=sll;
-          }
+          }
         }
       }
@@ -1158 +1160 @@
   {
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
-#ifdef KDEBUG
-    loop_count++;
-#ifdef HAVE_RINGS
-    if (TEST_OPT_DEBUG) PrintS("--- next step ---\n");
-#endif
-    if (TEST_OPT_DEBUG) messageSets(strat);
-#endif
+    #ifdef KDEBUG
+      loop_count++;
+      #ifdef HAVE_RINGS
+        if (TEST_OPT_DEBUG) PrintS("--- next step ---\n");
+      #endif
+      if (TEST_OPT_DEBUG) messageSets(strat);
+    #endif
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND