Changeset 79d3879 in git

Timestamp:

Feb 10, 2009, 7:53:04 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e21b396f6745381f496dbabf91502758f132efe0

Parents:

198a3392c9c3fdba4fd627b0d5f123a0bde019f3

Message:

*hannes: debug stuff


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

Location:

kernel

Files:

• kstd2.cc (modified) (3 diffs)
• kutil.cc (modified) (2 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.79 2008-12-26 18:15:40 levandov Exp $ */
+/* $Id: kstd2.cc,v 1.80 2009-02-10 18:53:04 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -912 +912 @@
 static int bba_count = 0;
 #endif
+void kDebugPrint(kStrategy strat);
 
 ideal bba (ideal F, ideal Q,intvec *w,intvec *hilb,kStrategy strat)
@@ -950 +951 @@
   kStratInitChangeTailRing(strat);
 #endif
+  //kDebugPrint(strat);
 
   /* compute------------------------------------------------------- */

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.116 2009-01-06 16:53:54 Singular Exp $ */
+/* $Id: kutil.cc,v 1.117 2009-02-10 18:53:04 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -6424 +6424 @@
 #endif
 
+// kstd1.cc:
+int redFirst (LObject* h,kStrategy strat);
+int redEcart (LObject* h,kStrategy strat);
+void enterSMora (LObject p,int atS,kStrategy strat, int atR=-1);
+void enterSMoraNF (LObject p,int atS,kStrategy strat, int atR=-1);
+// ../Singular/misc.cc:
+char *  showOption();
+
+void kDebugPrint(kStrategy strat)
+{
+  PrintS("red: ");
+    if (strat->red==redFirst) PrintS("redFirst\n");
+    else if (strat->red==redHoney) PrintS("redHoney\n");
+    else if (strat->red==redEcart) PrintS("redEcart\n");
+    else if (strat->red==redHomog) PrintS("redHomog\n");
+    else  Print("%x\n",strat->red);
+  PrintS("posInT: ");
+    if (strat->posInT==posInT0) PrintS("posInT0\n");
+    else if (strat->posInT==posInT0) PrintS("posInT0\n");
+    else if (strat->posInT==posInT1) PrintS("posInT1\n");
+    else if (strat->posInT==posInT11) PrintS("posInT11\n");
+    else if (strat->posInT==posInT110) PrintS("posInT110\n");
+    else if (strat->posInT==posInT13) PrintS("posInT13\n");
+    else if (strat->posInT==posInT15) PrintS("posInT15\n");
+    else if (strat->posInT==posInT17) PrintS("posInT17\n");
+    else if (strat->posInT==posInT17_c) PrintS("posInT17_c\n");
+    else if (strat->posInT==posInT19) PrintS("posInT19\n");
+    else if (strat->posInT==posInT2) PrintS("posInT2\n");
+#ifdef HAVE_MORE_POS_IN_T
+    else if (strat->posInT==posInT_EcartFDegpLength) PrintS("posInT_EcartFDegpLength\n");
+    else if (strat->posInT==posInT_FDegpLength) PrintS("posInT_FDegpLength\n");
+    else if (strat->posInT==posInT_pLength) PrintS("posInT_pLength\n");
+#endif
+    else if (strat->posInT==posInT_EcartpLength) PrintS("posInT_EcartpLength\n");
+    else if (strat->posInT==posInTrg0) PrintS("posInTrg0\n");
+    else  Print("%x\n",strat->posInT);
+  PrintS("posInL: ");
+    if (strat->posInL==posInL0) PrintS("posInL0\n");
+    else if (strat->posInL==posInL10) PrintS("posInL10\n");
+    else if (strat->posInL==posInL11) PrintS("posInL11\n");
+    else if (strat->posInL==posInL110) PrintS("posInL110\n");
+    else if (strat->posInL==posInL13) PrintS("posInL13\n");
+    else if (strat->posInL==posInL15) PrintS("posInL15\n");
+    else if (strat->posInL==posInL17) PrintS("posInL17\n");
+    else if (strat->posInL==posInL17_c) PrintS("posInL17\n");
+    else if (strat->posInL==posInLSpecial) PrintS("posInLSpecial\n");
+    else if (strat->posInL==posInLrg0) PrintS("posInLrg0\n");
+    else  Print("%x\n",strat->posInL);
+  PrintS("enterS: ");
+    if (strat->enterS==enterSBba) PrintS("enterSBba\n");
+    else if (strat->enterS==enterSMora) PrintS("enterSMora\n");
+    else if (strat->enterS==enterSMoraNF) PrintS("enterSMoraNF\n");
+    else  Print("%x\n",strat->enterS);
+  PrintS("initEcart: ");
+    if (strat->initEcart==initEcartBBA) PrintS("initEcartBBA\n");
+    else if (strat->initEcart==initEcartNormal) PrintS("initEcartNormal\n");
+    else  Print("%x\n",strat->initEcart);
+  PrintS("initEcartPair: ");
+    if (strat->initEcartPair==initEcartPairBba) PrintS("initEcartPairBba\n");
+    else if (strat->initEcartPair==initEcartPairMora) PrintS("initEcartPairMora\n");
+    else  Print("%x\n",strat->initEcartPair);
+  Print("homog=%d, LazyDegree=%d, LazyPass=%d, ak=%d,\n",
+         strat->homog, strat->LazyDegree,strat->LazyPass, strat->ak);
+  Print("honey=%d, sugarCrit=%d, Gebauer=%d, noTailReduction=%d\n",
+         strat->honey,strat->sugarCrit,strat->Gebauer,strat->noTailReduction,strat->use_buckets);
+  Print("posInLDependsOnLength=%d, use_buckets=%d\n",
+         strat->posInLDependsOnLength,strat->use_buckets);
+   PrintS(showOption());PrintLn();
+}
+
+
 #ifdef HAVE_SHIFTBBA
 poly pMove2CurrTail(poly p, kStrategy strat)