Changeset 2b3caae in git

Timestamp:

Dec 18, 2009, 5:09:26 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

9821ca7eb7f00bcded47abfce2ebbf6fee5c0e6d

Parents:

1c35568d7e5a5987077ae991beaea0a846eec9ce

Message:

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

Location:

kernel

Files:

• ideals.cc (modified) (2 diffs)
• ideals.h (modified) (2 diffs)

kernel/ideals.cc

@@ -191 +191 @@
     IDELEMS(ide) = j+1;
   }
+}
+
+/*2
+* copies the first k (>= 1) entries of the given ideal
+* and returns these as a new ideal
+* (Note that the copied polynomials may be zero.)
+*/
+ideal idCopyFirstK (const ideal ide, const int k)
+{
+  ideal newI = idInit(k, 0);
+  for (int i = 0; i < k; i++)
+    newI->m[i] = pCopy(ide->m[i]);
+  return newI;
 }
 
@@ -560 +573 @@
 
 /*2
-* insert h2 into h1 (if h2 is neither the zero polynomial
-* nor a generator in h1)
+* insert h2 into h1 depending on the two boolean parameters:
+* - if zeroOk is true, then h2 will also be inserted when it is zero
+* - if duplicateOk is true, then h2 will also be inserted when it is
+*   already present in h1
 * return TRUE iff h2 was indeed inserted
 */
-BOOLEAN idInsertPolyNoDuplicates (ideal h1, poly h2)
-{
-  bool h2FoundInH1 = false;
-  int i = 0;
-  while ((i < IDELEMS(h1)) && (!h2FoundInH1))
-  {
-    h2FoundInH1 = pEqualPolys(h1->m[i], h2);
-    i++;
-  }
-  if (!h2FoundInH1) return idInsertPoly(h1, h2);
-  else return FALSE;
+BOOLEAN idInsertPolyWithTests (ideal h1, const int validEntries,
+  const poly h2, const bool zeroOk, const bool duplicateOk)
+{
+  if ((!zeroOk) && (h2 == NULL)) return FALSE;
+  if (!duplicateOk)
+  {
+    bool h2FoundInH1 = false;
+    int i = 0;
+    while ((i < validEntries) && (!h2FoundInH1))
+    {
+      h2FoundInH1 = pEqualPolys(h1->m[i], h2);
+      i++;
+    }
+    if (h2FoundInH1) return FALSE;
+  }
+  if (validEntries == IDELEMS(h1))
+  {
+    pEnlargeSet(&(h1->m), IDELEMS(h1), 16);
+    IDELEMS(h1) += 16;
+  }
+  h1->m[validEntries] = h2;
+  return TRUE;
 }
 

kernel/ideals.h

@@ -12 +12 @@
 #ifdef PDEBUG
 ideal idDBInit (int size, int rank, const char *f, int l);
+ideal idCopyFirstK (const ideal ide, const int k);
 #define idInit(A,B) idDBInit(A,B,__FILE__,__LINE__)
 #else
 /*- creates an ideal -*/
 ideal idInit (int size, int rank=1);
+ideal idCopyFirstK (const ideal ide, const int k);
 #endif
 /*- deletes an ideal -*/
@@ -56 +58 @@
 BOOLEAN idInsertPoly (ideal h1,poly h2);
   /* h1 + h2 */
-BOOLEAN idInsertPolyNoDuplicates (ideal h1,poly h2);
+BOOLEAN idInsertPolyWithTests (ideal h1, const int validEntries,
+  const poly h2, const bool zeroOk, const bool duplicateOk);
   /* h1 + h2 */
 ideal idMult (ideal h1,ideal h2);