Changeset e9c3b2 in git

Timestamp:

Mar 15, 2011, 7:17:47 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

92e0ebb492f002a11e78b302b3758d32aedea17e

Parents:

1ed3466deda30d9e243b441fb4bc4e0c4729cf69

Message:

ADD: intvec: new view() method
ADD: some debug for NF strategy object
ADD: idSize

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

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

Location:

kernel

Files:

• ideals.cc (modified) (1 diff)
• ideals.h (modified) (2 diffs)
• intvec.cc (modified) (1 diff)
• intvec.h (modified) (1 diff)
• kstd1.cc (modified) (1 diff)
• kstd2.cc (modified) (1 diff)

kernel/ideals.cc

@@ -71 +71 @@
 }
 
-#ifndef NDEBUG
+#ifdef PDEBUG
 // this is only for outputting an ideal within the debugger
 void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint)

kernel/ideals.h

@@ -54 +54 @@
 #endif
 ideal idCopyFirstK (const ideal ide, const int k);
-/*- deletes an ideal -*/
+
+/// delete an ideal
 #define idDelete(h) id_Delete(h, currRing)
 void id_Delete (ideal* h, ring r);
 void id_ShallowDelete (ideal* h, ring r);
-  /*- initialise an ideal -*/
+/*- initialise an ideal -*/ // ?
+
+/// initialise the maximal ideal (at 0)
 ideal idMaxIdeal (int deg);
-  /*- initialise the maximal ideal (at 0) -*/
+
+/// gives an ideal the minimal possible size
 void idSkipZeroes (ideal ide);
-/* index of generator with leading term in ground ring (if any);
-   otherwise -1 */
+
+/// index of generator with leading term in ground ring (if any); otherwise -1
 int idPosConstant (ideal id);
-  /*gives an ideal the minimal possible size*/
+
+/// Count the effective size of an ideal
+/// (without the trailing allocated zero-elements)
+static inline int idSize(const ideal id)
+{
+  int j = IDELEMS(id) - 1;
+  poly* mm = id->m;
+  while ((j >= 0) && (mm[j] == NULL)) j--;
+  return (j + 1); 
+};
+
 void idNorm(ideal id);
 void idDelMultiples(ideal id);
@@ -207 +221 @@
 ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing = currRing); // image of certain map for BGG
 
-#ifndef NDEBUG
+#ifdef PDEBUG
 /* Shows an ideal -- only for debugging */
 void idShow(const ideal id, const ring lmRing = currRing, const ring tailRing = currRing, const int debugPrint = 0);
-#endif
-#endif
+#else
+#define idShow(id, lmRing, tailRing, debugPrint) ((void)0)
+#endif
+#endif

kernel/intvec.cc

@@ -125 +125 @@
 {
   return omStrDup(ivString(1, 0, dim));
+}
+
+void intvec::view () const
+{
+  Print ("intvec: {rows: %d, cols: %d, length: %d, Values: \n", rows(), cols(), length());
+
+  for (int i = 0; i < rows(); i++)
+  {
+    Print ("Row[%3d]:", i);
+    for (int j = 0; j < cols(); j++)
+      Print (" %5d", this->operator[]((i)*cols()+j) );
+    PrintLn ();
+  }
+  PrintS ("}\n");
 }
 

kernel/intvec.h

@@ -86 +86 @@
   inline void length(int l) { row = l; col = 1; }
   void show(int mat=0,int spaces=0) const;
+  void view() const;
+
   inline void makeVector() { row*=col;col=1; }
   char * String(int dim = 2) const;

kernel/kstd1.cc

@@ -1502 +1502 @@
   p = pCopy(q);
   deleteHC(&p,&o,&j,strat);
+  kTest(strat);
   if (TEST_OPT_PROT) { PrintS("r"); mflush(); }
+  if (BVERBOSE(23)) kDebugPrint(strat);
   if (p!=NULL) p = redMoraNF(p,strat, lazyReduce & KSTD_NF_ECART);
   if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))

kernel/kstd2.cc

@@ -1293 +1293 @@
   kTest(strat);
   if (TEST_OPT_PROT) { PrintS("r"); mflush(); }
+  if (BVERBOSE(23)) kDebugPrint(strat);
   int max_ind;
   p = redNF(pCopy(q),max_ind,lazyReduce & KSTD_NF_NONORM,strat);