Changeset dd5534 in git for Singular/iparith.cc

Timestamp:

Mar 15, 2011, 3:45:13 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

91b031a4e88cb480f4ba993bf5904694c62d9b34

Parents:

c4dab43d69dd36ed09ba07d4e771236f8a7bcc39

Message:

fixed dim of ideal and sum of ideals over rings (with Anne)

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

File:

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

Singular/iparith.cc

@@ -27 +27 @@
 #include <kernel/longtrans.h>
 #include <kernel/ideals.h>
+#include <kernel/prCopy.h>
 #include <kernel/matpol.h>
 #include <kernel/kstd1.h>
@@ -1759 +1760 @@
 {
   assumeStdFlag(v);
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+  {
+    ring origR = currRing;
+    ring tempR = rCopy(origR);
+    tempR->ringtype = 0; tempR->ch = 0;
+    rComplete(tempR);
+    ideal vid = (ideal)v->Data();
+    int i = idPosConstant(vid);
+    if ((i != -1) && (nIsUnit(pGetCoeff(vid->m[i]))))
+    { /* ideal v contains unit; dim = -1 */
+      res->data = (char *)-1;
+      return FALSE;
+    }
+    rChangeCurrRing(tempR);
+    ideal vv = idrCopyR(vid, origR, currRing);
+    ideal ww = idrCopyR((ideal)w->Data(), origR, currRing);
+    /* drop degree zero generator from vv (if any) */
+    if (i != -1) pDelete(&vv->m[i]);
+    long d = (long)scDimInt(vv, ww);    
+    if (rField_is_Ring_Z(origR) && (i == -1)) d++;
+    res->data = (char *)d;
+    idDelete(&vv); idDelete(&ww);
+    rChangeCurrRing(origR);
+    rDelete(tempR);
+    return FALSE;
+  }
+#endif
   if(currQuotient==NULL)
     res->data = (char *)((long)scDimInt((ideal)(v->Data()),(ideal)w->Data()));
@@ -3599 +3628 @@
 {
   assumeStdFlag(v);
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+  {
+    ring origR = currRing;
+    ring tempR = rCopy(origR);
+    tempR->ringtype = 0; tempR->ch = 0;
+    rComplete(tempR);
+    ideal vid = (ideal)v->Data();
+    int i = idPosConstant(vid);
+    if ((i != -1) && (nIsUnit(pGetCoeff(vid->m[i]))))
+    { /* ideal v contains unit; dim = -1 */
+      res->data = (char *)-1;
+      return FALSE;
+    }
+    rChangeCurrRing(tempR); rComplete(tempR);
+    ideal vv = idrCopyR(vid, origR, currRing);
+    /* drop degree zero generator from vv (if any) */
+    if (i != -1) pDelete(&vv->m[i]);
+    long d = (long)scDimInt(vv, currQuotient);    
+    if (rField_is_Ring_Z(origR) && (i == -1)) d++;
+    res->data = (char *)d;
+    idDelete(&vv);
+    rChangeCurrRing(origR);
+    rDelete(tempR);
+    return FALSE;
+  }
+#endif
   res->data = (char *)(long)scDimInt((ideal)(v->Data()),currQuotient);
   return FALSE;