Changeset dd5534 in git for kernel/ideals.cc

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

File:

• kernel/ideals.cc (modified) (3 diffs)

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          
         }
       }