Changeset 9c4865b in git

Timestamp:

Jan 27, 2010, 1:33:04 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

9239449fb81b97dbf98619fb5dcba7343d2e8861

Parents:

9008029955f32c6d5ef414a2e5d9bf43a5c892f6

Message:

structs.h cleanup

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

Location:

kernel

Files:

• febase.cc (modified) (1 diff)
• kutil.cc (modified) (2 diffs)
• misc.cc (modified) (1 diff)
• ring.cc (modified) (1 diff)
• ring.h (modified) (1 diff)
• sparsmat.cc (modified) (1 diff)
• structs.h (modified) (2 diffs)

kernel/febase.cc

@@ -47 +47 @@
 char    prompt_char = '>'; /*1 either '>' or '.'*/
 extern "C" {
+BITSET  test=(BITSET)0;
 BITSET  verbose = 1
                   | Sy_bit(V_REDEFINE)

kernel/kutil.cc

@@ -215 +215 @@
 
 
-BITSET  test=(BITSET)0;
 int     HCord;
 int     Kstd1_deg;
@@ -6643 +6642 @@
   Print("posInLDependsOnLength=%d, use_buckets=%d\n",
          strat->posInLDependsOnLength,strat->use_buckets);
-   PrintS(showOption());PrintLn();
+  PrintS(showOption());PrintLn();
+  PrintS("LDeg: ");
+    if (currRing->pLDeg==pLDeg0) PrintS("pLDeg0");
+    else if (currRing->pLDeg==pLDeg0c) PrintS("pLDeg0c");
+    else if (currRing->pLDeg==pLDegb) PrintS("pLDegb");
+    else if (currRing->pLDeg==pLDeg1) PrintS("pLDeg1");
+    else if (currRing->pLDeg==pLDeg1c) PrintS("pLDeg1c");
+    else if (currRing->pLDeg==pLDeg1_Deg) PrintS("pLDeg1_Deg");
+    else if (currRing->pLDeg==pLDeg1c_Deg) PrintS("pLDeg1c_Deg");
+    else if (currRing->pLDeg==pLDeg1_Totaldegree) PrintS("pLDeg1_Totaldegree");
+    else if (currRing->pLDeg==pLDeg1c_Totaldegree) PrintS("pLDeg1c_Totaldegree");
+    else if (currRing->pLDeg==pLDeg1_WFirstTotalDegree) PrintS("pLDeg1_WFirstTotalDegree");
+    else if (currRing->pLDeg==pLDeg1c_WFirstTotalDegree) PrintS("pLDeg1c_WFirstTotalDegree");
+    else Print("? (%lx)", (long)currRing->pLDeg);
+    PrintS(" / ");
+    if (strat->tailRing->pLDeg==pLDeg0) PrintS("pLDeg0");
+    else if (strat->tailRing->pLDeg==pLDeg0c) PrintS("pLDeg0c");
+    else if (strat->tailRing->pLDeg==pLDegb) PrintS("pLDegb");
+    else if (strat->tailRing->pLDeg==pLDeg1) PrintS("pLDeg1");
+    else if (strat->tailRing->pLDeg==pLDeg1c) PrintS("pLDeg1c");
+    else if (strat->tailRing->pLDeg==pLDeg1_Deg) PrintS("pLDeg1_Deg");
+    else if (strat->tailRing->pLDeg==pLDeg1c_Deg) PrintS("pLDeg1c_Deg");
+    else if (strat->tailRing->pLDeg==pLDeg1_Totaldegree) PrintS("pLDeg1_Totaldegree");
+    else if (strat->tailRing->pLDeg==pLDeg1c_Totaldegree) PrintS("pLDeg1c_Totaldegree");
+    else if (strat->tailRing->pLDeg==pLDeg1_WFirstTotalDegree) PrintS("pLDeg1_WFirstTotalDegree");
+    else if (strat->tailRing->pLDeg==pLDeg1c_WFirstTotalDegree) PrintS("pLDeg1c_WFirstTotalDegree");
+    else Print("? (%lx)", (long)strat->tailRing->pLDeg);
+    Print(" syzring:%d, syzComp(strat):%d syzComb(ring)\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit());
+
 }
 

kernel/misc.cc

@@ -48 +48 @@
 
 omBin char_ptr_bin = omGetSpecBin(sizeof(char_ptr));
-omBin smprec_bin = omGetSpecBin(sizeof(smprec));
-omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));
 
 /*0 implementation*/

kernel/ring.cc

@@ -42 +42 @@
 
 #define BITS_PER_LONG 8*SIZEOF_LONG
+
+omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));
 
 static const char * const ringorder_name[] =

kernel/ring.h

@@ -460 +460 @@
 void rDelete(ring r);
 
-#endif
+extern struct omBin_s* sip_sring_bin;
+#endif

kernel/sparsmat.cc

@@ -52 +52 @@
 static BOOLEAN smHaveDenom(poly);
 static number smCleardenom(ideal);
+
+struct omBin_s* smprec_bin = omGetSpecBin(sizeof(smprec));
 
 static poly pp_Mult_Coeff_mm_DivSelect_MultDiv(poly p, int &lp, poly m,

kernel/structs.h

@@ -683 +683 @@
 
 /*the general set of std-options --> kutil.cc */
-extern BITSET test;
 /*the general set of verbose-options --> febase.cc */
 #ifdef __cplusplus
+extern "C" BITSET test;
 extern "C" BITSET verbose;
 #else
+extern BITSET test;
 extern BITSET verbose;
-#endif
-/*debugging the bison grammar --> grammar.cc*/
-#ifdef YYDEBUG
-#if YYDEBUG
-extern int    yydebug;
-#endif
 #endif
 
@@ -818 +813 @@
 
 extern struct omBin_s* char_ptr_bin;
-extern struct omBin_s* smprec_bin;
-extern struct omBin_s* sip_sring_bin;
 extern struct omBin_s* sleftv_bin;