Changeset 0a64b14 in git

Timestamp:

Nov 5, 2008, 4:40:39 PM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

b503d0252f1680bb308156af73414127915b891a

Parents:

ec146d912ee5e6f0789c4f2e65c1507040db488b

Message:

Minoriteration für GMG.

extra.cc: system("minor", ...) im EXTENDED_SYSTEM
ideals.cc: idMinor aus alter idMinors erstellt
ideals.h: idMinor Deklaration


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

Files:

• Singular/extra.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.283 2008-10-02 12:02:36 Singular Exp $ */
+/* $Id: extra.cc,v 1.284 2008-11-05 15:40:38 wienand Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -2473 +2473 @@
     else
 #endif
+    if (strcmp(sys_cmd, "minor")==0)
+    {
+      ring r = currRing;
+      matrix a = (matrix) h->Data();
+      h = h->next;
+      int ar = (int) h->Data();
+      h = h->next;
+      int which = (int) h->Data();
+      h = h->next;
+      ideal R = NULL;
+      if (h != NULL)
+      {
+        R = (ideal) h->Data();
+      }
+      res->data=(poly) idMinor(a, ar, (unsigned long) which, R);
+      if (res->data == (poly) 1)
+      {
+        res->rtyp=INT_CMD;
+        res->data = 0;
+      }
+      else
+      {
+        res->rtyp=POLY_CMD;
+      }
+      return(FALSE);
+    }
+    else
 #ifdef HAVE_F5
 /*==================== F5 Implementation =================*/

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.59 2008-08-02 14:20:22 Singular Exp $ */
+/* $Id: ideals.cc,v 1.60 2008-11-05 15:40:38 wienand Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -2527 +2527 @@
 }
 
+/*2
+* compute the which-th ar-minor of the matrix a
+*/
+poly idMinor(matrix a, int ar, unsigned long which, ideal R)
+{
+  int     i,j,k,size;
+  unsigned long curr;
+  int *rowchoise,*colchoise;
+  BOOLEAN rowch,colch;
+  ideal result;
+  matrix tmp;
+  poly p,q;
+
+  i = binom(a->rows(),ar);
+  j = binom(a->cols(),ar);
+
+  rowchoise=(int *)omAlloc(ar*sizeof(int));
+  colchoise=(int *)omAlloc(ar*sizeof(int));
+  if ((i>512) || (j>512) || (i*j >512)) size=512;
+  else size=i*j;
+  result=idInit(size,1);
+  tmp=mpNew(ar,ar);
+  k = 0; /* the index in result*/
+  curr = 0; /* index of current minor */
+  idInitChoise(ar,1,a->rows(),&rowch,rowchoise);
+  while (!rowch)
+  {
+    idInitChoise(ar,1,a->cols(),&colch,colchoise);
+    while (!colch)
+    {
+      if (curr == which)
+      {
+        for (i=1; i<=ar; i++)
+        {
+          for (j=1; j<=ar; j++)
+          {
+            MATELEM(tmp,i,j) = MATELEM(a,rowchoise[i-1],colchoise[j-1]);
+          }
+        }
+        p = mpDetBareiss(tmp);
+        if (p!=NULL)
+        {
+          if (R!=NULL)
+          {
+            q = p;
+            p = kNF(R,currQuotient,q);
+            pDelete(&q);
+          }
+          /*delete the matrix tmp*/
+          for (i=1; i<=ar; i++)
+          {
+            for (j=1; j<=ar; j++) MATELEM(tmp,i,j) = NULL;
+          }
+          idDelete((ideal*)&tmp);
+          omFreeSize((ADDRESS)rowchoise,ar*sizeof(int));
+          omFreeSize((ADDRESS)colchoise,ar*sizeof(int));
+          return (p);
+        }
+      }
+      curr++;
+      idGetNextChoise(ar,a->cols(),&colch,colchoise);
+    }
+    idGetNextChoise(ar,a->rows(),&rowch,rowchoise);
+  }
+  return (poly) 1;
+}
+
 #ifdef WITH_OLD_MINOR
 /*2

kernel/ideals.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.h,v 1.10 2008-03-19 17:44:09 Singular Exp $ */
+/* $Id: ideals.h,v 1.11 2008-11-05 15:40:39 wienand Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -111 +111 @@
 ideal   idElimination (ideal h1,poly delVar, intvec *hilb=NULL);
 
+poly idMinor(matrix a, int ar, unsigned long which, ideal R=NULL);
+
 ideal   idMinors(matrix a, int ar, ideal R=NULL);