Changeset e5fc4d4 in git

Timestamp:

Apr 22, 2005, 8:09:43 PM (18 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

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

Children:

d5bd816e7a2f244105274429818a7d2c90398eee

Parents:

a4240cfd934cce40503d1d44e30ef8a2d812ca97

Message:

*levandov: big update - in idElimination, the ordering check introduced, minor fixes throughout the code


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

Location:

kernel

Files:

• gring.cc (modified) (10 diffs)
• gring.h (modified) (2 diffs)
• ideals.cc (modified) (4 diffs)
• ring.cc (modified) (3 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.24 2005-04-22 16:33:13 Singular Exp $
+ *  Version: $Id: gring.cc,v 1.25 2005-04-22 18:09:42 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -1617 +1617 @@
 poly nc_p_CopyGet(poly a, const ring r)
 /* for use in getting the mult. matrix elements*/
-{
+/* ring r must be a currRing! */
+/* for consistency, copies a poly from the comm. r->nc->basering */
+/* to its image in NC ring */
+{
+  if (r != currRing)
+  {
+#ifdef PDEBUF
+    Werror("nc_p_CopyGet call not in currRing");
+#endif
+    return(NULL);
+  }
   if (!rIsPluralRing(r)) return(p_Copy(a,r));
   if (r==r->nc->basering) return(p_Copy(a,r));
@@ -1628 +1638 @@
 poly nc_p_CopyPut(poly a, const ring r)
 /* for use in defining the mult. matrix elements*/
-{
+/* ring r must be a currRing! */
+/* for consistency, puts a polynomial from the NC ring */
+/* to its presentation in the comm. r->nc->basering */
+{
+  if (r != currRing)
+  {
+#ifdef PDEBUF
+    Werror("nc_p_CopyGet call not in currRing");
+#endif
+    return(NULL);
+  }
   if (!rIsPluralRing(r)) return(p_Copy(a,r));
   if (r==r->nc->basering) return(p_Copy(a,r));
@@ -1637 +1657 @@
 }
 
-int nc_CheckSubalgebra(poly PolyVar, ring r)
+BOOLEAN nc_CheckSubalgebra(poly PolyVar, ring r)
   /* returns TRUE if there were errors */
   /* checks whether product of vars from PolyVar defines */
   /* an admissible subalgebra of r */
-  /* r is indeed currRing */
+  /* r is indeed currRing and assumed to be noncomm. */
 {
   ring save = currRing;
@@ -1692 +1712 @@
 }
 
-int nc_CheckOrdCondition(matrix D, ring r)
+BOOLEAN nc_CheckOrdCondition(matrix D, ring r)
 /* returns TRUE if there were errors */
 /* checks whether the current ordering */
@@ -1702 +1722 @@
   ring save = currRing;
   int WeChangeRing = 0;
-  if (currRing != r)
+  if (r != currRing)
   {
     rChangeCurrRing(r);
@@ -1709 +1729 @@
   poly p,q;
   int i,j;
-  int report = 1;
+  int report = 0;
   for(i=1; i<r->N; i++)
   {
@@ -1721 +1741 @@
         p_SetExp(q,j,1,r);
         p_Setm(q,r);
-        if (p_LmCmp(q,p,r) != 1) /* i.e. lm(p)< lm(q)  */
+        if (p_LmCmp(q,p,r) != 1) /* i.e. lm(p)==xy < lm(q)==D_ij  */
         {
           Print("Bad ordering at %d,%d\n",i,j);
@@ -1728 +1748 @@
           p_Write(q,r);
 #endif
-          report = 0;
+          report = 1;
         }
         p_Delete(&q,r);
@@ -1738 +1758 @@
   if ( WeChangeRing )
     rChangeCurrRing(save);
-  return(!report);
+  return(report);
 }
 

kernel/gring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gring.h,v 1.10 2005-04-21 16:16:45 levandov Exp $ */
+/* $Id: gring.h,v 1.11 2005-04-22 18:09:42 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -18 +18 @@
 /* the part, related to the interface */ 
 BOOLEAN nc_CallPlural(matrix CC, matrix DD, poly CN, poly DN, ring r);
-int nc_CheckOrdCondition(matrix D, ring r);
-int nc_CheckSubalgebra(poly PolyVar, ring r);
+BOOLEAN nc_CheckOrdCondition(matrix D, ring r);
+BOOLEAN nc_CheckSubalgebra(poly PolyVar, ring r);
 BOOLEAN nc_InitMultiplication(ring r);
 BOOLEAN rIsLikeOpposite(ring rBase, ring rCandidate);

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.9 2005-04-21 16:16:46 levandov Exp $ */
+/* $Id: ideals.cc,v 1.10 2005-04-22 18:09:43 levandov Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2374 +2374 @@
     /* the subalgebra to be intersected with */
   {
-    if (currRing->nc->type!=nc_skew)
+    if (currRing->nc->type!=nc_skew) /* in (quasi)-commutative algebras every subalgebra is admissible */
     {
       if (nc_CheckSubalgebra(delVar,currRing))
@@ -2426 +2426 @@
 
 #ifdef HAVE_PLURAL
-  // update nc structure on tmpR
-  // in particular, tests the admissibility of the ordering
-  if (nc_rComplete(origR, &tmpR)) 
-  {
-    WerrorS("no elimination is possible: subalgebra is not admissible");
-    // goto cleanup
+  /* update nc structure on tmpR */
+  int BAD = 0;
+  if ( nc_rComplete(origR, &tmpR) ) 
+  {
+    Werror("error in nc_rComplete");
+    BAD = 1;
+  }
+  if (!BAD) 
+  {
+    /* tests the admissibility of the new elim. ordering */
+    if ( nc_CheckOrdCondition( (&tmpR)->nc->D, &tmpR) )
+    {
+      Werror("no elimination is possible: ordering condition is violated");
+      BAD = 1;
+    }
+  }
+  if (BAD)
+  {
+    // cleanup
     omFree((ADDRESS)wv[0]);
     omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
@@ -2438 +2451 @@
     omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
     rUnComplete(&tmpR);
-    if (w!=NULL)
+    if (w!=NULL)      
+    {
       delete w;
+    }
     return idCopy(h1);
   }

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.32 2005-04-21 16:16:46 levandov Exp $ */
+/* $Id: ring.cc,v 1.33 2005-04-22 18:09:42 levandov Exp $ */
 
 /*
@@ -3929 +3929 @@
   if (src->N != N)
   {
+    /* should not happen */
     WarnS("wrong nc_rComplete call");
     return TRUE;
   }
-//   ncKill(dest); // in order to init new
-//   if (nc_CallPlural(src->nc->C, src->nc->D, NULL, NULL, dest))
-//   {
-//     return TRUE;
-//   }
-//   else
-//     return FALSE;
-  //  if (dest->nc != NULL)
-  //    ncKill(dest);
-  //  dest->nc           = (nc_struct *)omAlloc0(sizeof(nc_struct));
-  //  dest->nc->ref      = 1; 
-  //  dest->nc->basering = dest;
-  //  dest->nc->type     =  src->nc->type;
   ring save = currRing;
   int WeChangeRing = 0;
@@ -3962 +3950 @@
     for (j= i+1; j<= N; j++)
     {
-      //      n = p_GetCoeff(MATELEM(C0,i,j), src);
-      //      p = pOne();
-      //      p_SetCoeff(p,n,dest);
-      //      MATELEM(C,i,j) = nc_p_CopyPut(p, dest);
-      p = prCopyR(MATELEM(C0,i,j), src, dest); // like in nc_p_CopyGet
-      MATELEM(C,i,j) = p; //nc_p_CopyPut(p, dest);
-      //      p_Delete(&p,dest);
+      n = n_Copy(p_GetCoeff(MATELEM(C0,i,j), src),src);
+      p = p_ISet(1,dest);
+      p_SetCoeff(p,n,dest);
+      MATELEM(C,i,j) = p;
       p = NULL;
       if (MATELEM(D0,i,j) != NULL)
       {
-        p = prCopyR(MATELEM(D0,i,j), src, dest); // like in nc_p_CopyGet
-        MATELEM(D,i,j) = p; //nc_p_CopyPut(p, dest);
-        //      p_Delete(&p,dest);
+        p = prCopyR(MATELEM(D0,i,j), src->nc->basering, dest);
+        MATELEM(D,i,j) = nc_p_CopyPut(p, dest);
+        p_Delete(&p, dest);
         p = NULL;
       }
     }
   }
-  idTest((ideal)C);
-  idTest((ideal)D);
+  /* One must test C and D _only_ in r->nc->basering!!! not in r!!! */
+  //  idTest((ideal)C);
+  //  idTest((ideal)D);
   id_Delete((ideal *)&(dest->nc->C),dest->nc->basering);
   id_Delete((ideal *)&(dest->nc->D),dest->nc->basering);