Changeset f8fb93d in git for kernel/GBEngine/kstd1.cc

Timestamp:

May 17, 2016, 3:33:14 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e6f1e67739dcb8bc40ce2fcd97b4b37cfe8f0302

Parents:

045cbe4a6ae2c0b09895eb1b2407beeb5c723e7e

Message:

removed unused debug stuff from bba/mora

File:

• kernel/GBEngine/kstd1.cc (modified) (8 diffs)

kernel/GBEngine/kstd1.cc

@@ -12 +12 @@
 #define MORA_USE_BUCKETS
 
-#define MYTEST 0
-
 #define ADIDEBUG 0
 #define ADIDEBUG_NF 0
@@ -23 +21 @@
 #include <misc/options.h>
 #include <misc/intvec.h>
-
-#if MYTEST
-#ifdef HAVE_TAIL_RING
-#undef HAVE_TAIL_RING
-#endif /* ifdef HAVE_TAIL_RING */
-#endif /* if MYTEST */
 
 #include <polys/weight.h>
@@ -1616 +1608 @@
   kTest_TS(strat);
   strat->use_buckets = kMoraUseBucket(strat);
-  /*- compute-------------------------------------------*/
 
 #ifdef HAVE_TAIL_RING
@@ -1629 +1620 @@
   }
 
+  /*- compute-------------------------------------------*/
   while (strat->Ll >= 0)
   {
@@ -1836 +1828 @@
       if (strat->P.lcm!=NULL)
       {
-#if defined(HAVE_RINGS)
-        pLmDelete(strat->P.lcm);
+#ifdef HAVE_RINGS
+        if (rField_is_Ring(currRing)) pLmDelete(strat->P.lcm);
+        else
 #else
-        pLmFree(strat->P.lcm);
+          pLmFree(strat->P.lcm);
 #endif
         strat->P.lcm=NULL;
       }
+
 #ifdef KDEBUG
       // make sure kTest_TS does not complain about strat->P
@@ -1866 +1860 @@
     }
     kTest_TS(strat);
-
-#if ADIDEBUG
-    Print("\n    The new reducer list T -- at the end of loop %d -- is\n",loop_count);
-    for(int iii=0;iii<=strat->tl;iii++)
-    {
-      printf("\n    T[%d]:",iii);
-      p_Write(strat->T[iii].p,strat->tailRing);
-    }
-    PrintLn();
-
-    loop_count++;
-#endif /* ADIDEBUG */
   }
   /*- complete reduction of the standard basis------------------------ -*/
@@ -2293 +2275 @@
   idTest(F);
   if (Q!=NULL) idTest(Q);
-
-#if MYTEST
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("// kSTD: currRing: ");
-    rWrite(currRing);
-  }
-#endif
-
 #endif
 #ifdef HAVE_PLURAL
@@ -2504 +2477 @@
   idTest(F);
   idTest(Q);
-
-#if MYTEST
-  if (TEST_OPT_DEBUG)
-  {
-    PrintS("// kSTD: currRing: ");
-    rWrite(currRing);
-  }
-#endif
-
 #endif
 #ifdef HAVE_PLURAL