Changeset 8ebd1a0 in git

Timestamp:

Apr 25, 2005, 8:15:25 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

5d00520a016f7e7089be25484b5cc41e3b897fd4

Parents:

720ff4a017189777645e1e4ed50e4080ba8f1edb

Message:

* avoid plural bugs for commutative rings


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

Location:

kernel

Files:

• ideals.cc (modified) (2 diffs)
• kstd1.cc (modified) (3 diffs)
• kutil.cc (modified) (2 diffs)
• prCopy.cc (modified) (2 diffs)
• syz.cc (modified) (2 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.10 2005-04-22 18:09:43 levandov Exp $ */
+/* $Id: ideals.cc,v 1.11 2005-04-25 18:15:23 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2427 +2427 @@
 #ifdef HAVE_PLURAL
   /* 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**));
-    omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
-    omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
-    omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
-    rUnComplete(&tmpR);
-    if (w!=NULL)      
-    {
-      delete w;
-    }
-    return idCopy(h1);
+  if (rIsPluralRing(currRing))
+  {
+    BOOLEAN BAD = FALSE;
+    if ( nc_rComplete(origR, &tmpR) ) 
+    {
+      Werror("error in nc_rComplete");
+      BAD = TRUE;
+    }
+    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 = TRUE;
+      }
+    }
+    if (BAD)
+    {
+      // cleanup
+      omFree((ADDRESS)wv[0]);
+      omFreeSize((ADDRESS)wv,ordersize*sizeof(int**));
+      omFreeSize((ADDRESS)ord,ordersize*sizeof(int));
+      omFreeSize((ADDRESS)block0,ordersize*sizeof(int));
+      omFreeSize((ADDRESS)block1,ordersize*sizeof(int));
+      rUnComplete(&tmpR);
+      if (w!=NULL)      
+      {
+        delete w;
+      }
+      return idCopy(h1);
+    }
   }
 #endif

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.6 2005-04-11 15:59:01 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.7 2005-04-25 18:15:23 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1231 +1231 @@
       // statistics
       if (TEST_OPT_PROT) PrintS("s");
+      // cancel unit
+      cancelunit(&strat->P);
       // normalization
       if (!TEST_OPT_INTSTRATEGY)
@@ -1242 +1244 @@
       if (TEST_OPT_INTSTRATEGY)
         strat->P.pCleardenom();
-      // cancel unit
-      cancelunit(&strat->P);
 
       // put in T

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.7 2005-03-17 14:15:13 Singular Exp $ */
+/* $Id: kutil.cc,v 1.8 2005-04-25 18:15:24 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -4104 +4104 @@
     for (l=IDELEMS(r)-1;l>=0;l--)
     {
-      if (r->m[l]!=NULL)
+      if ((r->m[l]!=NULL)
+      && (strat->syzComp>0)
+      && (pGetComp(r->m[l])<=strat->syzComp))
       {
         for(q=IDELEMS(Q)-1; q>=0;q--)

kernel/prCopy.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prCopy.cc,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
+/* $Id: prCopy.cc,v 1.2 2005-04-25 18:15:25 Singular Exp $ */
 /*
 * ABSTRACT - implementation of functions for Copy/Move/Delete for Polys
@@ -26 +26 @@
     assume(n == pGetCoeff(dest));
   }
-  if (rRing_has_Comp(dest_r))
+  if (rRing_has_Comp(dest_r) && rRing_has_Comp(src_r))
     p_SetComp(dest, p_GetComp( src,src_r), dest_r);
   assume(n == pGetCoeff(dest));

kernel/syz.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz.cc,v 1.8 2005-03-17 14:14:17 Singular Exp $ */
+/* $Id: syz.cc,v 1.9 2005-04-25 18:15:25 Singular Exp $ */
 
 /*
@@ -781 +781 @@
     }
   }
-  //if (idHomModule(res[0],currQuotient,&w)!=isHomog)
-  //{
-  //  Warn("betti-command: Input is not homogeneous!");
-  //  weights=NULL;
-  //}
+#if 0
+  if (idHomModule(res[0],currQuotient,&w)!=isHomog)
+  {
+    Warn("betti-command: Input is not homogeneous!");
+    weights=NULL;
+  }
+#endif
   if (weights==NULL) weights=w;
   else delete w;