Changeset dd5534 in git

Timestamp:

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

Author:

Frank Seelisch <seelisch@…>

Branches:

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

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

Files:

• Singular/iparith.cc (modified) (3 diffs)
• Tst/Short/Zdim_s.res.gz.uu (added)
• Tst/Short/Zdim_s.stat (added)
• Tst/Short/Zdim_s.tst (added)
• Tst/Short/ZidealAdd_s.res.gz.uu (added)
• Tst/Short/ZidealAdd_s.stat (added)
• Tst/Short/ZidealAdd_s.tst (added)
• kernel/ideals.cc (modified) (3 diffs)
• kernel/ideals.h (modified) (1 diff)
• kernel/pInline1.h (modified) (1 diff)
• kernel/polys1.cc (modified) (1 diff)

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;

kernel/ideals.cc

@@ -94 +94 @@
 #endif
 
+/* index of generator with leading term in ground ring (if any);
+   otherwise -1 */
+int idPosConstant(ideal id)
+{
+  int k;
+  for (k = IDELEMS(id)-1; k>=0; k--)
+  {
+    if (p_LmIsConstantComp(id->m[k], currRing) == TRUE)
+      return k;
+  }
+  return -1;
+}
+
 /*2
 * initialise the maximal ideal (at 0)
@@ -223 +236 @@
 
 /*2
-* ideal id = (id[i]), c any number
+* ideal id = (id[i]), c any unit
 * if id[i] = c*id[j] then id[j] is deleted for j > i
 */
@@ -236 +249 @@
       for (j=k; j>i; j--)
       {
-        if ((id->m[j]!=NULL)
-        && (pComparePolys(id->m[i], id->m[j])))
+        if (id->m[j]!=NULL)
         {
-          pDelete(&id->m[j]);
+#ifdef HAVE_RINGS
+          if (rField_is_Ring(currRing))
+          {
+            /* if id[j] = c*id[i] then delete id[j].
+               In the below cases of a ground field, we
+               check whether id[i] = c*id[j] and, if so,
+               delete id[j] for historical reasons (so
+               that previous output does not change) */
+            if (pComparePolys(id->m[j], id->m[i])) pDelete(&id->m[j]);
+          }
+          else
+          {
+            if (pComparePolys(id->m[i], id->m[j])) pDelete(&id->m[j]);
+          }
+#else
+          if (pComparePolys(id->m[i], id->m[j])) pDelete(&id->m[j]);
+#endif          
         }
       }

kernel/ideals.h

@@ -62 +62 @@
   /*- initialise the maximal ideal (at 0) -*/
 void idSkipZeroes (ideal ide);
+/* index of generator with leading term in ground ring (if any);
+   otherwise -1 */
+int idPosConstant (ideal id);
   /*gives an ideal the minimal possible size*/
 void idNorm(ideal id);

kernel/pInline1.h

@@ -587 +587 @@
 {
   if (p == NULL) return FALSE;
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+    return (p_LmIsConstant(p, r) && nIsUnit(pGetCoeff(p)));
+#endif
   return p_LmIsConstant(p, r);
 }

kernel/polys1.cc

@@ -1717 +1717 @@
   if (pLength(p1) != pLength(p2))
     return FALSE;
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+  {
+    if ((pLength(p1) == 1) && (nEqual(pGetCoeff(p1), pGetCoeff(p2))))
+      return TRUE;
+    if (!nIsUnit(pGetCoeff(p2))) return FALSE;
+  }
+#endif
   n=nDiv(pGetCoeff(p1),pGetCoeff(p2));
   while ((p1 != NULL) /*&& (p2 != NULL)*/)