Changeset fb12237 in git

Timestamp:

Dec 9, 2014, 4:09:27 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

6a70f3e584dbb423be6457c84a588264e2893b4f

Parents:

b9fafaf9fbd3e95f838b97bd12f93ce9db2cc162

Message:

revisiting kstd1::red*: cleanup

File:

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

kernel/GBEngine/kstd1.cc

@@ -67 +67 @@
 
 /* the list of all options which may be used by option and test */
+/* defintion of ALL options: libpolys/misc/options.h */
 BITSET validOpts=Sy_bit(0)
                 |Sy_bit(1)
@@ -381 +382 @@
   h->SetShortExpVector();
 #if ADIDEBUG_NF
-  PrintLn();
-  PrintS("  Searching for a poly in T that divides h (of ecart ");
-  Print("%i) ...",h->ecart);
-  PrintLn();
+  Print("\n  Searching for a poly in T that divides h (of ecart %i) ...\n",h->ecart);
 #endif
   loop
@@ -393 +391 @@
     {
       ei = strat->T[j].ecart;
-      PrintLn();
-      Print("    Found one: T[%i",j);
-      Print("] of ecart %i",ei);
-      PrintS(": ");p_Write(strat->T[j].p,strat->tailRing);
-      PrintLn();
-      PrintS("    Try to find another with smaller ecart:");
-      PrintLn();
+      Print("\n    Found one: T[%i] of ecart %i: ",j,ei);
+      p_Write(strat->T[j].p,strat->tailRing);
+      PrintS("\n    Try to find another with smaller ecart:\n");
     }
     else
     {
-      PrintLn();
-      PrintS("    No poly in T divides h.");
-      PrintLn();
+      PrintS("\n    No poly in T divides h.\n");
     }
 #endif
@@ -455 +447 @@
       if(iii == ii)
       {
-        PrintLn();
-        PrintS("    None was found.");
-        PrintLn();
+        PrintS("\n    None was found.\n");
       }
       else
       {
-        PrintLn();
-        Print("    A better one (ecart = %i): T[",ei);
-        Print("%i] = ",ii);p_Write(strat->T[ii].p,strat->tailRing);
+        Print("\n    A better one (ecart = %i): T[%i] = ",ei,ii);
+        p_Write(strat->T[ii].p,strat->tailRing);
         PrintLn();
       }
@@ -500 +489 @@
     doRed(h,&(strat->T[ii]),strat->fromT,strat);
     #if ADIDEBUG_NF
-    PrintLn();
-    PrintS("  Partial Reduced h = ");p_Write(h->p,strat->tailRing);
+    PrintS("\n  Partial Reduced h = ");p_Write(h->p,strat->tailRing);
     PrintLn();
     #endif
@@ -509 +497 @@
     if (h->IsNull())
     {
-      if (h->lcm!=NULL) pLmFree(h->lcm);
+      if (h->lcm!=NULL) pLmDelete(h->lcm);
       h->Clear();
       return 0;
@@ -1342 +1330 @@
 }
 
-
 void initSba(ideal F,kStrategy strat)
 {
@@ -1359 +1346 @@
     strat->red2 = redHomog;
   }
-#if defined(HAVE_RINGS) || defined(HAVE_RINGS_LOC)  //TODO Oliver
+#if defined(HAVE_RINGS) || defined(HAVE_RINGS_LOC)  //TODO Oliver  
   if (rField_is_Ring(currRing))
   {
@@ -1563 +1550 @@
 #if ADIDEBUG
 #ifdef KDEBUG
-    PrintLn();
-    Print("-------------------------------- LOOP %d ---------------------------------------\n",loop_count);
+    Print("\n-------------------------------- LOOP %d ---------------------------------------\n",loop_count);
     //print the list L: (p1,p2,p)
-    PrintLn();
-    Print("    The pair list L -- in loop %d  -- is:\n",loop_count);
+    Print("\n    The pair list L -- in loop %d  -- is:\n",loop_count);
     for(int iii=0;iii<=strat->Ll;iii++)
     {
-      PrintLn();
-      Print("    L[%d]: ",iii);
-      PrintLn();
+      Print("\n    L[%d]:\n",iii);
       PrintS("        ");p_Write(strat->L[iii].p1,strat->tailRing);
       PrintS("        ");p_Write(strat->L[iii].p2,strat->tailRing);
@@ -1591 +1574 @@
     PrintS("      p2 = "); p_Write(strat->P.p2,strat->tailRing);PrintLn();
     PrintS("      p = "); p_Write(strat->P.p,strat->tailRing); PrintLn();
-    PrintLn();
-    Print("    The old reducer list T -- at the beg of loop %d -- is :",loop_count);
+    Print("\n    The old reducer list T -- at the beg of loop %d -- is :",loop_count);
     if(strat->tl<0)
-    {PrintS(" Empty.");PrintLn();}
+    {PrintS(" Empty.\n");}
     else
     for(int iii=0;iii<=strat->tl;iii++)
     {
-      PrintLn();
-      Print("    T[%d]:",iii);
+      Print("\n    T[%d]:",iii);
       p_Write(strat->T[iii].p,strat->T->tailRing);
     }
@@ -1679 +1660 @@
         for(int iii=0;iii<=strat->Ll;iii++)
         {
-          PrintLn();
-          PrintS("    L[%d]:\n",iii);
+          PrintS("\n    L[%d]:\n",iii);
           PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
           PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
@@ -2096 +2076 @@
   if(!TEST_OPT_RETURN_SB)
     strat->syzComp = syzComp;
-  if (TEST_OPT_SB_1)
+  if (TEST_OPT_SB_1
     #ifdef HAVE_RINGS
-    if(!rField_is_Ring(currRing))
+    &&(!rField_is_Ring(currRing))
     #endif
+    )
     strat->newIdeal = newIdeal;
   if (rField_has_simple_inverse(currRing))