Changeset 6815af in git

Timestamp:

May 9, 2005, 9:34:19 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

745dd8aa6e5dac7832a30be6d3ca34ea1f92eddd

Parents:

b453507d9130cdc5fa6f4298af48bc2e16c88ab1

Message:

*hannes: rDecompose: plural rings have poly data: check added


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

File:

• Singular/ipshell.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.110 2005-05-06 17:31:05 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.111 2005-05-09 07:34:19 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -1580 +1580 @@
 lists rDecompose(const ring r)
 {
-  // sanity check:
+  // sanity check: require currRing==r for rings with polynomial data
   if ((r!=currRing) 
-  && ((r->minpoly!=NULL) || (r->qideal!=NULL) || (r->minideal!=NULL))
-  )
-  {
-    WerrorS("ring must be the base ring or compatible");
+  && ((r->minpoly!=NULL) || (r->qideal!=NULL) || (r->minideal!=NULL)
+#ifdef HAVE_PLURAL
+  || (rIsPluralRing(r))
+#endif
+  ))
+  {
+    WerrorS("ring with polynomial data must be the base ring or compatible");
     return NULL;
   }
@@ -1788 +1791 @@
       if (R->algring->qideal!=NULL)
       {
-        R->minpoly=pGetCoeff(R->algring->qideal->m[0]);
+        if (IDELEMS(R->algring->qideal)==1)
+        {
+          R->minpoly=pGetCoeff(R->algring->qideal->m[0]);
+          omFreeBinAddr(R->algring->qideal->m[0]);
+          R->algring->qideal->m[0]=NULL;
+          idDelete(&(R->algring->qideal));
+        }
+        else
+        {
+          WerrorS("not implemented yet.");
+        }
       }
     }