Changeset 535b07 in git for kernel

Timestamp:

Jul 7, 2015, 12:51:32 PM (9 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

22d119e2f3926b708140a4db3479c1c31c0ba384

Parents:

d762df9ec71d7bdcea2d647c0b3cc592a7eb400d

Message:

add: debug outputs in kstd1.cc
add: finalReduceByMon in bba

File:

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

kernel/GBEngine/kstd1.cc

@@ -1667 +1667 @@
         message(strat->P.ecart+strat->P.GetpFDeg(),&olddeg,&reduc,strat, red_result);
       // reduce
+      #if ADIDEBUG
+      printf("\nThis is P vor red:\n");p_Write(strat->P.p,strat->tailRing);p_Write(strat->P.p1,strat->tailRing);p_Write(strat->P.p2,strat->tailRing);
+      printf("\nBefore Ll = %i\n", strat->Ll);
+      #endif
       red_result = strat->red(&strat->P,strat);
+      #if ADIDEBUG
+      printf("\nThis is P nach red:\n");p_Write(strat->P.p,strat->tailRing);p_Write(strat->P.p1,strat->tailRing);p_Write(strat->P.p2,strat->tailRing);
+      printf("\nBefore Ll = %i\n", strat->Ll);
+      #endif
     }
 
@@ -1717 +1725 @@
       enterpairs(strat->P.p,strat->sl,strat->P.ecart,0,strat, strat->tl);
       // put in S
+
+        #if ADIDEBUG
+        Print("\n    The new pair list L -- after superenterpairs in loop %d -- is:\n",loop_count);
+        for(int iii=0;iii<=strat->Ll;iii++)
+        {
+          printf("\n    L[%d]:\n",iii);
+          PrintS("         ");p_Write(strat->L[iii].p,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
+        }
+        #endif
       strat->enterS(strat->P,
                     posInS(strat,strat->sl,strat->P.p, strat->P.ecart),
                     strat, strat->tl);
+      #if ADIDEBUG
+      printf("\nThis pair has been added to S:\n");
+      pWrite(strat->P.p);
+      pWrite(strat->P.p1);
+      pWrite(strat->P.p2);
+      #endif
 
       // apply hilbert criterion
@@ -1766 +1791 @@
     for(int iii=0;iii<=strat->tl;iii++)
     {
-      PrintS("\n    T[%d]:",iii);
+      printf("\n    T[%d]:",iii);
       p_Write(strat->T[iii].p,strat->tailRing);
     }
@@ -1802 +1827 @@
 //    }
 //  }
+#ifdef HAVE_RINGS
+  if(nCoeff_is_Ring_Z(currRing->cf))
+    finalReduceByMon(strat);
+#endif
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
   SI_RESTORE_OPT1(save1);