Changeset 47fed0 in git for Singular/matpol.cc

Timestamp:

Dec 16, 1999, 2:35:20 PM (24 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

9a9127abd147a78f19e64ecaef1dc0cb27890f97

Parents:

41427b203c97a89990d3f996aa35d8ae9f9cf162

Message:

minor with "kNF"


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

File:

• Singular/matpol.cc (modified) (6 diffs)

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.29 1999-11-15 17:20:22 obachman Exp $ */
+/* $Id: matpol.cc,v 1.30 1999-12-16 13:35:19 pohl Exp $ */
 
 /*
@@ -16 +16 @@
 #include "tok.h"
 #include "lists.h"
+#include "ipid.h"
+#include "kstd1.h"
 #include "polys.h"
 #include "mmemory.h"
@@ -349 +351 @@
 
 /*2
-* entries of a are minors and go to result
-*/
-void mpMinorToResult(ideal result, int &elems, matrix a, int r, int c)
+* entries of a are minors and go to result (only if not in R) 
+*/
+void mpMinorToResult(ideal result, int &elems, matrix a, int r, int c,
+                     ideal &R)
 {
   poly *q1;
@@ -357 +360 @@
   int i,j;
 
+  if (R != NULL)
+  {
+    for (i=r-1;i>=0;i--)
+    {
+      q1 = &(a->m)[i*a->ncols];
+      for (j=c-1;j>=0;j--)
+      {
+        if (q1[j]!=NULL) q1[j] = kNF(R,currQuotient,q1[j]);
+      }
+    }
+  }
   for (i=r-1;i>=0;i--)
   {
@@ -389 +403 @@
 * produces recursively the ideal of all arxar-minors of a
 */
-void mpRecMin(int ar,ideal result,int &elems,matrix a,int lr,int lc,poly barDiv)
+void mpRecMin(int ar,ideal result,int &elems,matrix a,int lr,int lc,
+              poly barDiv, ideal &R)
 {
   int k;
@@ -408 +423 @@
       if (ar>1)
       {
-        mpRecMin(ar-1,result,elems,nextLevel,kr,k,a->m[kr*a->ncols+k]);
+        mpRecMin(ar-1,result,elems,nextLevel,kr,k,a->m[kr*a->ncols+k],R);
         mpPartClean(nextLevel,kr,k);
       }
-      else mpMinorToResult(result,elems,nextLevel,kr,k);
+      else mpMinorToResult(result,elems,nextLevel,kr,k,R);
       if (ar>k-1) break;
     }