Changeset 52e2f6 in git for kernel/ideals.cc

Timestamp:

Jun 10, 2008, 12:17:33 PM (15 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

28325ab307b0d45f178c4ce869547de7d3f3faa7

Parents:

f2b58394b7c0b28984794adfcef85f56f72e35bf

Message:

*motsak: major redesign of NC Subsystem, maybe something more...


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

File:

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

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.55 2008-04-04 09:51:37 Singular Exp $ */
+/* $Id: ideals.cc,v 1.56 2008-06-10 10:17:31 motsak Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -26 +26 @@
 
 
+#define MYTEST 0
+
+
 /* #define WITH_OLD_MINOR */
 #define pCopy_noCheck(p) pCopy(p)
@@ -65 +68 @@
 void idShow(ideal id)
 {
-  Print("Module of rank %d,real rank %d 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]);
+  if( id == NULL )
+    Print("(NULL)");
+  else
+  {
+    Print("Module of rank %d,real rank %d 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]);
+      }
     }
   }
@@ -1299 +1307 @@
   }
   h2->rank = syzcomp+i+1;
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Prepare::h2: ");
+  idPrint(h2);
+#endif  
+#endif
+  
   for (j=0; j<=i; j++)
   {
@@ -1316 +1332 @@
 #ifdef PDEBUG
   for(j=0;j<IDELEMS(h2);j++) pTest(h2->m[j]);
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Prepare::Input: ");
+  idPrint(h2);
+
+  Print("Prepare::currQuotient: ");
+  idPrint(currQuotient);
+#endif  
 #endif
-  h3=kStd(h2,currQuotient,h,w,NULL,syzcomp);
+  
+#endif
+
+  
+  h3 = kStd(h2,currQuotient,h,w,NULL,syzcomp);
   idDelete(&h2);
   return h3;
@@ -1528 +1557 @@
   if (k==1) verbose |=Sy_bit(V_IDLIFT);
 
-  ring orig_ring=currRing;
-  ring syz_ring=rCurrRingAssure_SyzComp();
+  ring orig_ring = currRing;
+  ring syz_ring = rCurrRingAssure_SyzComp();
   rSetSyzComp(k);
 
+  
+#if MYTEST
+#ifdef RDEBUG
+  rWrite(syz_ring);
+  rDebugPrint(syz_ring);
+#endif  
+#endif
+  
   ideal s_h1=h1;
 
@@ -1539 +1576 @@
     s_h1 = h1;
 
+#if MYTEST
+#ifdef RDEBUG
+  Print("Input: ");
+  idPrint(s_h1);
+#endif  
+#endif
+ 
+
   ideal s_h3=idPrepare(s_h1,h,k,&w);
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Prepare: ");
+  idPrint(s_h3);
+#endif  
+#endif
+
   ideal s_h2 = idInit(IDELEMS(s_h3), s_h3->rank);
 
+#if MYTEST
+#ifdef RDEBUG
+  Print("Temp: ");
+  idPrint(s_h2);
+#endif  
+#endif
+  
   if (w!=NULL) delete w;
   i = 0;
+
   for (j=0; j<IDELEMS(s_h3); j++)
   {
@@ -1571 +1632 @@
 
   idSkipZeroes(s_h3);
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Input'': ");
+  idPrint(s_h3);
+#endif  
+#endif
+
   j = IDELEMS(s_h1);
 
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Temp Result: ");
+  idPrint(s_h2);
+#endif  
+#endif
+
+  
   if (syz_ring!=orig_ring)
   {
@@ -1609 +1687 @@
     s_h3->m[i] = prMoveR_NoSort(s_h3->m[i], syz_ring);
   }
+
+#if MYTEST
+#ifdef RDEBUG
+  Print("Output STD Ideal: ");
+  idPrint(s_h3);
+
+  Print("Output Matrix: ");
+  iiWriteMatrix(*ma, "ma", 2, 4);
+#endif  
+#endif
+  
 
   if (syz_ring!=orig_ring) rKill(syz_ring);
@@ -2328 +2417 @@
   if (idIs0(h1)) return idInit(1,h1->rank);
 #ifdef HAVE_PLURAL
-  if (rIsPluralRing(currRing))
+  if (rIsPluralRing(origR))
     /* in the NC case, we have to check the admissibility of */
     /* the subalgebra to be intersected with */
   {
-    if (ncRingType(currRing)!=nc_skew) /* in (quasi)-commutative algebras every subalgebra is admissible */
-    {
-      if (nc_CheckSubalgebra(delVar,currRing))
+    if ((ncRingType(origR) != nc_skew) && (ncRingType(origR) != nc_exterior)) /* in (quasi)-commutative algebras every subalgebra is admissible */
+    {
+      if (nc_CheckSubalgebra(delVar,origR))
       {
         WerrorS("no elimination is possible: subalgebra is not admissible");
@@ -2362 +2451 @@
   block0[0] = 1;
   block1[0] = rVar(origR);
-  wv[0]=(int*)omAlloc((pVariables+1)*sizeof(int));
-  memset(wv[0],0,(pVariables+1)*sizeof(int));
+  wv[0]=(int*)omAlloc((rVar(origR) + 1)*sizeof(int));
+  memset(wv[0],0,(rVar(origR) + 1)*sizeof(int));
   for (j=0;j<rVar(origR);j++)
     if (pGetExp(delVar,j+1)!=0) wv[0][j]=1;
@@ -2376 +2465 @@
   tmpR->block1 = block1;
   tmpR->wvhdl = wv;
+
   rComplete(tmpR, 1);
 
 #ifdef HAVE_PLURAL
   /* update nc structure on tmpR */
-  if (rIsPluralRing(currRing))
-  {
-    BOOLEAN bBAD = FALSE;
-    if ( nc_rComplete(origR, tmpR) )
+  if (rIsPluralRing(origR))
+  {
+    if ( nc_rComplete(origR, tmpR, false) ) // no quotient ideal!
     {
       Werror("error in nc_rComplete");
-      bBAD = TRUE;
-    }
-    if (!bBAD)
-    {
-      /* tests the admissibility of the new elim. ordering */
-      if ( nc_CheckOrdCondition( tmpR->nc->D, tmpR) )
-      {
-        Werror("no elimination is possible: ordering condition is violated");
-        bBAD = TRUE;
-      }
-    }
-    if (bBAD)
-    {
       // cleanup
       rDelete(tmpR);
       if (w!=NULL)
-      {
         delete w;
-      }
       return idCopy(h1);
     }