Changeset 645a19 in git for kernel/ideals.cc

Timestamp:

Jul 20, 2009, 2:01:13 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

195b03db00f5e08ad6a891adcf3a7794a5dd00bf

Parents:

45c67dc7a3eec0097d1ad6ff5635d960cc089937

Message:

*motsak: deep kernel implementation of induced Schreyer ordering + helpers


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

File:

• kernel/ideals.cc (modified) (15 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.74 2009-06-04 08:14:57 Singular Exp $ */
+/* $Id: ideals.cc,v 1.75 2009-07-20 12:00:50 motsak Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -9 +9 @@
 /* includes */
 #include "mod2.h"
+
+#ifndef NDEBUG
+# define MYTEST 0
+#else /* ifndef NDEBUG */
+# define MYTEST 0
+#endif /* ifndef NDEBUG */
+
 #include "structs.h"
 #include "omalloc.h"
@@ -26 +33 @@
 
 
-#define MYTEST 0
 
 
@@ -66 +72 @@
 //#ifndef __OPTIMIZE__
 // this is mainly for outputting an ideal within the debugger
-void idShow(ideal id)
-{
+void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint)
+{
+  assume( debugPrint >= 0 );
+  
   if( id == NULL )
     Print("(NULL)");
@@ -73 +81 @@
   {
     Print("Module of rank %ld,real rank %ld and %d generators.\n",
-           id->rank,idRankFreeModule(id),IDELEMS(id));
-    for (int i=0;i<id->ncols*id->nrows;i++)
-    {
-      if (id->m[i]!=NULL)
-      {
-        Print("generator %d: ",i);pWrite(id->m[i]);
-      }
+          id->rank,idRankFreeModule(id, lmRing, tailRing),IDELEMS(id));
+
+    int j = (id->ncols*id->nrows) - 1;
+    while ((j > 0) && (id->m[j]==NULL)) j--;
+    for (int i = 0; i <= j; i++)
+    {
+      Print("generator %d: ",i); p_DebugPrint(id->m[i], lmRing, tailRing, debugPrint);
     }
   }
@@ -1323 +1331 @@
   Print("Prepare::h2: ");
   idPrint(h2);
+
+  for(j=0;j<IDELEMS(h2);j++) pTest(h2->m[j]);
+
 #endif
 #endif
@@ -1356 +1367 @@
 #endif
 
+  idTest(h2);
 
   h3 = kStd(h2,currQuotient,hom,w,NULL,syzcomp);
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Prepare::Output: ");
+  idPrint(h3);
+  for(j=0;j<IDELEMS(h2);j++) pTest(h3->m[j]);
+#endif
+#endif
+
+
   idDelete(&h2);
   return h3;
@@ -1377 +1399 @@
   int ii, idElemens_h1;
 
+  assume(h1 != NULL);
+
   idElemens_h1=IDELEMS(h1);
 #ifdef PDEBUG
@@ -1412 +1436 @@
   }
 
-  ideal s_h3=idPrepare(s_h1,h,k,w);
+  idTest(s_h1);
+
+  ideal s_h3=idPrepare(s_h1,h,k,w); // main (syz) GB computation
 
   if (s_h3==NULL)
@@ -1589 +1615 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Input: ");
+  Print("idLiftStd Input: ");
   idPrint(s_h1);
 #endif
@@ -1599 +1625 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Prepare: ");
+  Print("idLiftStd Prepare: ");
   idPrint(s_h3);
 #endif
@@ -1608 +1634 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Temp: ");
+  Print("idLiftStd Temp: ");
   idPrint(s_h2);
 #endif
@@ -1646 +1672 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Input'': ");
+  Print("idLiftStd Input'': ");
   idPrint(s_h3);
 #endif
@@ -1656 +1682 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Temp Result: ");
+  Print("idLiftStd Temp Result: ");
   idPrint(s_h2);
 #endif
@@ -1701 +1727 @@
 #if MYTEST
 #ifdef RDEBUG
-  Print("Output STD Ideal: ");
+  Print("idLiftStd Output STD Ideal: ");
   idPrint(s_h3);
 
-  Print("Output Matrix: ");
+  Print("idLiftStd Output Matrix: ");
   iiWriteMatrix(*ma, "ma", 2, 4);
 #endif