Changeset c616d1 in git

Timestamp:

Sep 30, 1998, 4:12:48 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d3e295ae509633cf6ba993a8680945f24b9ab5ec

Parents:

8f14736613d731d65fa80a0322e2debe3dd2a3b0

Message:

hannes/pohl: minor fix


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

Location:

Singular

Files:

• ideals.cc (modified) (23 diffs)
• matpol.cc (modified) (5 diffs)

Singular/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.37 1998-09-29 21:14:43 siebert Exp $ */
+/* $Id: ideals.cc,v 1.38 1998-09-30 14:12:47 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -25 +25 @@
 
 
+// #define WITH_OLD_MINOR
+
 static poly * idpower;
 /*collects the monomials in makemonoms, must be allocated befor*/
@@ -37 +39 @@
 * initialise an ideal
 */
-#ifdef MDEBUG
+#ifdef PDEBUG
 ideal idDBInit(int idsize, int rank, char *f, int l)
 #else
@@ -44 +46 @@
 {
   /*- initialise an ideal -*/
-#ifdef MDEBUG
+#if defined(MDEBUG) && defined(PDEBUG)
   ideal hh = (ideal )mmDBAllocBlock(sizeof(*hh),f,l);
 #else
@@ -54 +56 @@
   if (idsize>0)
   {
-#ifdef MDEBUG
+#if defined(MDEBUG) && defined(PDEBUG)
     hh->m = (poly *)mmDBAllocBlock0(idsize*sizeof(poly),f,l);
 #else
@@ -86 +88 @@
 * deletes an ideal/matrix
 */
-#ifdef MDEBUG
+#ifdef PDEBUG
 void idDBDelete (ideal* h, char *f, int l)
 #else
@@ -100 +102 @@
     do
     {
-      #ifdef MDEBUG
+      #ifdef PDEBUG
       pDBDelete(&((*h)->m[--j]),f,l);
       #else
@@ -107 +109 @@
     }
     while (j>0);
-    #ifdef MDEBUG
+    #if defined(MDEBUG) && defined(PDEBUG)
     mmDBFreeBlock((ADDRESS)((*h)->m),sizeof(poly)*elems,f,l);
     #else
@@ -113 +115 @@
     #endif
   }
-  #ifdef MDEBUG
+  #if defined(MDEBUG) && defined(PDEBUG)
   mmDBFreeBlock((ADDRESS)(*h),sizeof(**h),f,l);
   #else
@@ -298 +300 @@
 * copy an ideal
 */
-#ifdef MDEBUG
+#ifdef PDEBUG
 ideal idDBCopy(ideal h1,char *f,int l)
 #else
@@ -310 +312 @@
   if (h1 == NULL)
   {
-#ifdef MDEBUG
+#ifdef PDEBUG
     h2=idDBInit(1,1,f,l);
 #else
@@ -319 +321 @@
 //#endif
   {
-#ifdef MDEBUG
+#ifdef PDEBUG
     h2=idDBInit(IDELEMS(h1),h1->rank,f,l);
 #else
@@ -325 +327 @@
 #endif
     for (i=IDELEMS(h1)-1; i>=0; i--)
-#ifdef MDEBUG
+#ifdef PDEBUG
       h2->m[i] = pDBCopy(h1->m[i],f,l);
 #else
@@ -2268 +2270 @@
 }
 
+//void idEnterSet (poly p,ideal r, int * next)
+//{
+//
+//  if ((*next) == IDELEMS(r)-1)
+//  {
+//    pEnlargeSet(&(r->m),IDELEMS(r),16);
+//    IDELEMS(r)+=16;
+//  }
+//  int at;
+//  int i;
+//  if (*next==0) at=0;
+//  else
+//  {
+//    int an = 0;
+//    int en= *next-1;
+//    int c;
+//    if (pComp0(r->m[(*next)-1],p)!= 1)
+//      at=*next;
+//    else
+//    {
+//      loop
+//      {
+//        if (an >= en-1)
+//        {
+//          if (pComp0(r->m[an],p) == 1)
+//          {
+//            at=an; break;
+//          }
+//          else
+//          {
+//            at=en; break;
+//          }
+//        }
+//        i=(an+en) / 2;
+//        if (pComp0(r->m[i],p) == 1) en=i;
+//        else                       an=i;
+//      }
+//    }
+//  }
+//  if (pComp(r->m[at],p)==0)
+//  {
+//    pDelete(&p);
+//  }
+//  else
+//  {
+//    (*next)++;
+//    for (i=(*next); i>=at+1; i--)
+//    {
+//      r->m[i] = r->m[i-1];
+//    }
+//    /*- save result -*/
+//    r->m[at] = p;
+//  }
+//}
 /*3
 * produces recursively the ideal of all arxar-minors of a
@@ -2278 +2334 @@
   if((ar<0) || (ar>min(a->ncols,a->nrows)-1))
   {
+    idDelete((ideal *)&a);
+    pDelete(barDiv);
     return;
   }
@@ -2283 +2341 @@
 /*--- initializing temporary structures-------------------*/
   int i,j,r=rowToChose,c,newi,newp,k;
-  poly p=NULL,pp;
+  poly p=NULL;
 
   if (ar==0)
@@ -2295 +2353 @@
         if (p!=NULL)
         {
+          //idEnterSet(p,result,nextPlace);
           if (*nextPlace>=IDELEMS(result))
           {
-            pEnlargeSet(&(result->m),IDELEMS(result),16);
-            IDELEMS(result) += 16;
+            pEnlargeSet(&(result->m),IDELEMS(result),IDELEMS(result));
+            IDELEMS(result) *=2;
           }
-          MATELEM(a,i,j) = NULL;
           result->m[*nextPlace] = p;
           (*nextPlace)++;
+          MATELEM(a,i,j) = NULL;
         }
       }
@@ -2308 +2367 @@
     idTest(result);
     idDelete((ideal*)&a);
+    pDelete(barDiv);
     return;
   }
 /*--- ar>0, we perform one step of the Bareiss algorithm--*/
   p = pCopy(*barDiv);   //we had to store barDiv for the remaining loops
-  pp = pCopy(p);   //we had to store barDiv for the remaining loops
   matrix nextStep = mpOneStepBareiss(a,barDiv,&r,&c);
 //Print("next row is: %d, next col: %d\n",r,c);
-/*--- there is no pivot - the matrix is zero -------------*/
+/*--- there is no pivot - the det of matrix is zero -------------*/
   if ((r*c==0) || (MATELEM(nextStep,nextStep->nrows,nextStep->ncols)==NULL))
   {
+    idDelete((ideal*)&nextStep);
     idDelete((ideal*)&a);
-    idDelete((ideal*)&nextStep);
+    pDelete(&p);
+    // pDelete(barDiv); barDiv==NULL in this case
     return;
   }
@@ -2339 +2400 @@
     next = NULL;
   }
+  if ((*barDiv)!=NULL) pDelete(barDiv);
 /*--- now we have to take out the r-th row...------------*/
   if (((a->nrows)>1) && (rowToChose==0))
   {
+    if (nextStep!=NULL) idDelete((ideal*)&nextStep);
     nextStep = mpNew(a->nrows-1,a->ncols);
     for (i=r-1;i>0;i--)
@@ -2358 +2421 @@
     }
 /*--- and to perform the algorithm with the rest---------*/
-    idRecMin(nextStep,ar,&p,result,nextPlace);
+    poly q=pCopy(p);
+    idRecMin(nextStep,ar,&q,result,nextPlace);
+    assume(q==NULL);
     nextStep = NULL;
   }
@@ -2364 +2429 @@
   if ((a->nrows)>1)
   {
+    if (nextStep!=NULL) idDelete((ideal*)&nextStep);
     nextStep = mpNew(a->nrows,a->ncols-1);
     for (i=a->nrows;i>0;i--)
@@ -2384 +2450 @@
     idDelete((ideal*)&a);
     idRecMin(nextStep,ar,&p,result,nextPlace,r);
+    //assume(p==NULL);
     nextStep = NULL;
   }
 /*--- deleting temporary structures and returns----------*/
-  pDelete(barDiv);
   pDelete(&p);
-  pDelete(&pp);
   return;
 }
 
+#ifdef WITH_OLD_MINOR
+/*2
+* compute all ar-minors of the matrix a
+*/
+ideal idMinors(matrix a, int ar)
+{
+  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 = mpDetBareiss(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);
+}
+#else
 /*2
 * compute all ar-minors of the matrix a
@@ -2407 +2541 @@
   poly barDiv=NULL;
   ideal result=idInit(16,1);
-
-  idRecMin(mpCopy(a),ar-1,&barDiv,result,&i);
+  if (a->ncols>=a->nrows)
+  {
+    idRecMin(mpCopy(a),ar-1,&barDiv,result,&i);
+  }
+  else
+  {
+    idRecMin(mpTransp(a),ar-1,&barDiv,result,&i);
+  }
   idSkipZeroes(result);
   return result;
 }
+#endif
+
 
 /*2

Singular/matpol.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: matpol.cc,v 1.19 1998-09-29 21:14:45 siebert Exp $ */
+/* $Id: matpol.cc,v 1.20 1998-09-30 14:12:48 Singular Exp $ */
 
 /*
@@ -91 +91 @@
     t = a->m[i];
     pNormalize(t);
-#ifdef MDEBUG
-//    b->m[i] = pDBCopy(t,f,l);
     b->m[i] = pCopy(t);
-#else
-    b->m[i] = pCopy(t);
-#endif
   }
   b->rank=a->rank;
@@ -392 +387 @@
 
   /* step of Bareiss */
-  if((row && Bareiss->mpPivotRow(&w,row-1)) || Bareiss->mpPivotBareiss(&w))
+  if(((row!=0) && Bareiss->mpPivotRow(&w,row-1)) || Bareiss->mpPivotBareiss(&w))
   {
     Bareiss->mpElimBareiss(div);
@@ -580 +575 @@
         }
       }
-      p = mpDet(tmp);
+      p = mpDetBareiss(tmp);
       if ((k+l) & 1) p=pNeg(p);
       MATELEM(result,l,k) = p;
@@ -1413 +1408 @@
       }
       y = nDiv(pGetCoeff(r),x);
+      nNormalize(y);
       pSetCoeff(r,y);
       pIter(r);