Changeset 52b370b in git for Singular

Timestamp:

Nov 13, 1997, 10:09:28 AM (27 years ago)

Author:

Thomas Siebert <siebert@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

57eacd52438439e0ee05601a56132738dd1d14a1

Parents:

2012e62a5af6086d406b892ed90b543f56d4fae0

Message:

*** empty log message ***


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

Location:

Singular

Files:

• extra.cc (modified) (3 diffs)
• matpol.cc (modified) (4 diffs)
• matpol.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.21 1997-10-18 11:04:13 Singular Exp $ */
+/* $Id: extra.cc,v 1.22 1997-11-13 09:09:26 siebert Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -344 +344 @@
     if(strcmp((char*)(h->Data()),"red")==0)
     {
-      if ((h->next!=NULL) &&(h->next->Typ()==IDEAL_CMD))
+     if ((h->next!=NULL) &&(h->next->Typ()==IDEAL_CMD))
       {
         res->rtyp=IDEAL_CMD;
@@ -608 +608 @@
     else
 #endif
+/*==================== barstep =============================*/
+    if(strcmp((char*)(h->Data()),"barstep")==0)
+    {
+     if ((h->next!=NULL) &&(h->next->Typ()==MATRIX_CMD))
+      {
+        if (h->next->next!=NULL)
+        {
+          if (h->next->next->Typ()!=POLY_CMD)
+          {
+              Warn("Wrong types for barstep(matrix,poly)");
+          }
+        }
+        int r,c;
+        poly div=(poly)h->next->next->Data();
+        res->rtyp=MATRIX_CMD;
+        res->data=(void *)mpOneStepBareiss((matrix)h->next->Data(),
+                   &div,&r,&c);
+        Print("div: ");pWrite(div);
+        Print("rows: %d, cols: %d\n",r,c);
+        pDelete(&div);
+        return FALSE;
+      }
+      else
+        WerrorS("matrix expected");
+    }
 /*============================================================*/
       WerrorS("not implemented\n");

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.3 1997-04-02 15:07:25 Singular Exp $ */
+/* $Id: matpol.cc,v 1.4 1997-11-13 09:09:27 siebert Exp $ */
 
 /*
@@ -319 +319 @@
   mp_permmatrix(mp_permmatrix *);
   ~mp_permmatrix();
+  int mpGetRow();
+  int mpGetCol();
   int mpGetRdim();
   int mpGetCdim();
@@ -370 +372 @@
   delete v;
   return c;
+}
+
+/*2
+*  one step of 'Bareiss' algorithm
+*  for application in minor
+*  assume to have a full matrix
+*  if *H!=0, then divide by *H (the pivot from the step before)
+*  returns the choosen pivot *H=m[*r,*c]
+*  the result has the pivot at the right lower corner
+*/
+matrix mpOneStepBareiss (matrix a, poly *H, int *r, int *c)
+{
+  poly div=*H;
+  matrix re = mpCopy(a);
+  mp_permmatrix *Bareiss = new mp_permmatrix(re);
+  row_col_weight w(Bareiss->mpGetRdim(), Bareiss->mpGetCdim());
+
+  /* step of Bareiss */
+  if(Bareiss->mpPivotBareiss(&w))
+  {
+    Bareiss->mpElimBareiss(div);
+    div = Bareiss->mpGetElem(Bareiss->mpGetRdim(), Bareiss->mpGetCdim());
+    *H = pCopy(div);
+    *c = Bareiss->mpGetCol()+1;
+    *r = Bareiss->mpGetRow()+1;
+    Bareiss->mpRowReorder();
+    Bareiss->mpColReorder();
+  }
+  else
+  {
+    *H = NULL;
+    *c = *r = 0;
+  }
+  Bareiss->mpSaveArray();
+  delete Bareiss;
+  return re;
 }
 
@@ -1208 +1246 @@
 }
 
+int mp_permmatrix::mpGetRow()
+{
+  return qrow[s_m];
+}
+
+int mp_permmatrix::mpGetCol()
+{
+  return qcol[s_n];
+}
+
 /*2
 * exact division a/b, used in Bareiss algorithm

Singular/matpol.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.h,v 1.4 1997-04-09 12:19:58 Singular Exp $ */
+/* $Id: matpol.h,v 1.5 1997-11-13 09:09:28 siebert Exp $ */
 /*
 * ABSTRACT
@@ -47 +47 @@
 
 matrix mpBareiss (matrix a, BOOLEAN diagonal);
+matrix mpOneStepBareiss (matrix a, poly *H, int *r, int *c);
 poly mpDet (matrix m);
 matrix mpWedge(matrix a, int ar);