Changeset 43580ac in git

Timestamp:

Apr 14, 1998, 5:26:12 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

fd0608510d11eb671d534d98bbfe452dfc598852

Parents:

b7c8bdcf3068d073e49fa3669429999b074c12d0

Message:

* hannes/siebert: bug fix for version 1.19 -> 1.21


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

File:

• Singular/ideals.cc (modified) (14 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.20 1998-02-27 16:27:58 Singular Exp $ */
+/* $Id: ideals.cc,v 1.21 1998-04-14 15:26:12 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -149 +149 @@
       j = 0;
     else
-    { 
+    {
       for (k=j+1; k<IDELEMS(ide); k++)
         ide->m[k] = NULL;
@@ -2152 +2152 @@
   tmpR.wvhdl = wv;
   rComplete(&tmpR);
-  
+
   // change into the new ring
   pChangeRing(pVariables,currRing->OrdSgn,ord,block0,block1,wv);
@@ -2197 +2197 @@
 }
 
-/*2
-* compute all ar-minors of the matrix a
-*/
-ideal idMinors(matrix a, int ar)
-{
-  if(ar<=0)
-  {
-    Werror("%d-th minor ",ar);
-    return NULL;
-  }
-  int     i,j,k,size;
-  int *rowchoise,*colchoise;
-  BOOLEAN rowch,colch;
-  ideal result;
-  matrix tmp;
-  poly p;
-
-  i = binom(a->rows(),ar);
-  j = binom(a->cols(),ar);
-
-  rowchoise=(int *)Alloc(ar*sizeof(int));
-  colchoise=(int *)Alloc(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*/
-  idInitChoise(ar,1,a->rows(),&rowch,rowchoise);
-  while (!rowch)
-  {
-    idInitChoise(ar,1,a->cols(),&colch,colchoise);
-    while (!colch)
-    {
-      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 = mpDet(tmp);
-      if (p!=NULL)
-      {
-        if (k>=size)
-        {
-          pEnlargeSet(&result->m,size,32);
-          size += 32;
-        }
-        result->m[k] = p;
-        k++;
-      }
-      idGetNextChoise(ar,a->cols(),&colch,colchoise);
-    }
-    idGetNextChoise(ar,a->rows(),&rowch,rowchoise);
-  }
-  /*delete the matrix tmp*/
-  for (i=1; i<=ar; i++)
-  {
-    for (j=1; j<=ar; j++) MATELEM(tmp,i,j) = NULL;
-  }
-  idDelete((ideal*)&tmp);
-  if (k==0)
-  {
-    k=1;
-    result->m[0]=NULL;
-  }
-  Free((ADDRESS)rowchoise,ar*sizeof(int));
-  Free((ADDRESS)colchoise,ar*sizeof(int));
-  pEnlargeSet(&result->m,size,k-size);
-  IDELEMS(result) = k;
-  return (result);
-}
-
 /*3
 * produces recursively the ideal of all arxar-minors of a
 */
 static void idRecMin(matrix a,int ar,poly *barDiv,ideal result,
-              int * nextPlace, intvec * pfRows, intvec * iv)
+              int * nextPlace, int rowToChose=0)
 {
 //Print("Level: %d\n",ar);
@@ -2284 +2211 @@
 
 /*--- initializing temporary structures-------------------*/
-  int i,j,r,c,newi,newp,k;
+  int i,j,r=rowToChose,c,newi,newp,k;
   poly p=NULL,pp;
-  BOOLEAN justChosen=FALSE;
 
   if (ar==0)
@@ -2304 +2230 @@
           }
           MATELEM(a,i,j) = NULL;
-//if ((*nextPlace==21) || (*nextPlace==37))
-//{
-//  Print("Hier sind sie!\n");
-//}
-//pWrite(p);
           result->m[*nextPlace] = p;
           (*nextPlace)++;
@@ -2314 +2235 @@
       }
     }
+    idTest(result);
     idDelete((ideal*)&a);
     return;
@@ -2321 +2243 @@
   pp = pCopy(p);   //we had to store barDiv for the remaining loops
   matrix nextStep = mpOneStepBareiss(a,barDiv,&r,&c);
-/*--- we compute the row-index of the chosen row r -------*/
-  newi = 0;
-  while ((newi<iv->length()) && ((*iv)[newi]!=0)) newi++;
-  k = (*iv)[newi] = r;
-  for (j=newi-1;j>0;j--)
-  {
-    if (k>=(*iv)[j]) k++;
-  }
-  newp = 0;
-  while ((newp<pfRows->length()) && ((*pfRows)[newp]!=0)) 
-  {
-    if ((*pfRows)[newp]==k) 
-    {
-      justChosen = TRUE;
-//Print("just chosen\n");
-      break;
-    }
-    newp++;
-  }
-  if (!justChosen) (*pfRows)[newp] = k;
-//Print("Chosen: ");pfRows->show();PrintLn();
-//Print("Deleted: ");iv->show();PrintLn();
+//Print("next row is: %d, next col: %d\n",r,c);
+/*--- there is no pivot - the matrix is zero -------------*/
+  if (r*c==0)
+  {
+    idDelete((ideal*)&a);
+    return;
+  }
 /*--- we read out the r-1 x c-1 matrix for the next step--*/
   if ((a->nrows-1)*(a->ncols-1)>0)
@@ -2357 +2264 @@
     idDelete((ideal*)&nextStep);
 /*--- we call the next Step------------------------------*/
-    idRecMin(next,ar-1,barDiv,result,nextPlace,pfRows,iv);
+    idRecMin(next,ar-1,barDiv,result,nextPlace);
     next = NULL;
   }
 /*--- now we have to take out the r-th row...------------*/
-//Print("back for rows on Level: %d\n",ar);
-//Print("The actual row was %d\n",k);
-//Print("Chosen: ");pfRows->show();PrintLn();
-//Print("Deleted: ");iv->show();PrintLn();
-  if (((a->nrows)>1) && (!justChosen))
+  if (((a->nrows)>1) && (rowToChose==0))
   {
     nextStep = mpNew(a->nrows-1,a->ncols);
@@ -2383 +2286 @@
     }
 /*--- and to perform the algorithm with the rest---------*/
-    idRecMin(nextStep,ar,&p,result,nextPlace,pfRows,iv);
+    idRecMin(nextStep,ar,&p,result,nextPlace);
     nextStep = NULL;
   }
 /*--- now we have to take out the c-th col...------------*/
-//Print("back for cols on Level: %d\n",ar);
-//Print("Chosen: ");pfRows->show();PrintLn();
-//Print("Deleted: ");iv->show();PrintLn();
   if ((a->nrows)>1)
   {
@@ -2409 +2309 @@
       }
     }
+/*--- and to perform the algorithm with the rest---------*/
     idDelete((ideal*)&a);
-/*--- and to perform the algorithm with the rest---------*/
-    (*iv)[newi] = 0;
-    idRecMin(nextStep,ar,&p,result,nextPlace,pfRows,iv);
+    idRecMin(nextStep,ar,&p,result,nextPlace,r);
     nextStep = NULL;
   }
 /*--- deleting temporary structures and returns----------*/
-  if (!justChosen) (*pfRows)[newp] = 0;
   pDelete(barDiv);
   pDelete(&p);
@@ -2427 +2325 @@
 * the caller of idRecMin
 */
-ideal idMinors1(matrix a, int ar)
+ideal idMinors(matrix a, int ar)
 {
   if((ar<=0) || (ar>min(a->ncols,a->nrows)))
@@ -2435 +2333 @@
   }
   int i=0;
-  intvec * iv=new intvec(a->nrows+1);
-  intvec * pv=new intvec(a->nrows+1);
   poly barDiv=NULL;
-  ideal result=idInit(16,0);
-
-  idRecMin(mpCopy(a),ar-1,&barDiv,result,&i,pv,iv);
+  ideal result=idInit(16,1);
+  idTest(result);
+
+  idRecMin(mpCopy(a),ar-1,&barDiv,result,&i);
   idSkipZeroes(result);
-  delete iv;
-  delete pv;
   return result;
 }
@@ -3191 +3086 @@
   return res;
 }
+