Changeset dd5534 in git for kernel

Timestamp:

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

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

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

Location:

kernel

Files:

• ideals.cc (modified) (3 diffs)
• ideals.h (modified) (1 diff)
• pInline1.h (modified) (1 diff)
• polys1.cc (modified) (1 diff)

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)*/)