Changeset 9234fb in git

Timestamp:

Jan 9, 2013, 12:39:10 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

c81bf79ced86ab51e160b984ca42699ac44228a0

Parents:

14a45578ff0a670cc8f091fed8b195c50ef51126

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-01-09 12:39:10+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-19 20:27:28+01:00

Message:

add: idKeepFirstK() in ideals.cc

Conflicts:
	Singular/MinorInterface.cc
	kernel/ideals.cc
	kernel/ideals.h

Files:

• Singular/MinorInterface.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (1 diff)
• kernel/ideals.h (modified) (1 diff)

Singular/MinorInterface.cc

@@ -190 +190 @@
   /* before we return the result, let's omit zero generators
      in iii which come after the computed minors */
-  ideal jjj;
-  if (collectedMinors == 0) jjj = idInit(1);
-  else                      jjj = idCopyFirstK(iii, collectedMinors);
-  idDelete(&iii);
+  idKeepFirstK(iii, collectedMinors);
   delete[] myColumnIndices;
   delete[] myRowIndices;
-  return jjj;
+  return(iii);
 }
 

kernel/ideals.cc

@@ -2559 +2559 @@
 */
 
-
-
+/// keeps the first k (>= 1) entries of the given ideal
+/// (Note that the kept polynomials may be zero.)
+void idKeepFirstK(ideal id, const int k)
+{
+     for (int i = IDELEMS(id)-1; i >= k; i--)
+     {
+        if (id->m[i] != NULL) pDelete(&id->m[i]);
+     }
+     pEnlargeSet(&(id->m), IDELEMS(id), k-IDELEMS(id));
+     IDELEMS(id) = k;
+}
+

kernel/ideals.h

@@ -24 +24 @@
 }
 
+void idKeepFirstK(ideal ide, const int k);
+
 /// delete an ideal
 inline void idDelete (ideal* h, ring r = currRing)