Changeset ded085 in git for kernel/ideals.cc

Timestamp:

Dec 11, 2009, 4:40:02 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

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

Children:

867e1a39616ddc1692d837af059565a1320e8cc7

Parents:

b54a393fcb8e823c662951c5a6219096fb8a6800

Message:

in ring.cc: completed rChar for Z/n, Z/p^m, and Z/2^m
in ideals.*: made insertion into ideals return TRUE/FALSE instead of void

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

File:

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

kernel/ideals.cc

@@ -541 +541 @@
 
 /*2
-* concat h1 and h2
-*/
-void idInsertPoly (ideal h1,poly h2)
-{
-  if (h2==NULL) return;
+* insert h2 into h1 (if h2 is not the zero polynomial)
+* return TRUE iff h2 was indeed inserted
+*/
+BOOLEAN idInsertPoly (ideal h1, poly h2)
+{
+  if (h2==NULL) return FALSE;
   int j = IDELEMS(h1)-1;
   while ((j >= 0) && (h1->m[j] == NULL)) j--;
@@ -555 +556 @@
   }
   h1->m[j]=h2;
-}
-
-/*2
-* concat h1 and h2 (if h2 is neither zero nor a generator of h1)
-*/
-void idInsertPolyNoDuplicates (ideal h1,poly h2)
+  return TRUE;
+}
+
+/*2
+* insert h2 into h1 (if h2 is neither the zero polynomial
+* nor a generator in h1)
+* return TRUE iff h2 was indeed inserted
+*/
+BOOLEAN idInsertPolyNoDuplicates (ideal h1, poly h2)
 {
   bool h2FoundInH1 = false;
@@ -569 +573 @@
     i++;
   }
-  if (!h2FoundInH1) idInsertPoly(h1, h2);
+  if (!h2FoundInH1) return idInsertPoly(h1, h2);
+  else return FALSE;
 }