Changeset c232af in git for Singular/mpr_base.cc

Timestamp:

Aug 14, 2000, 2:58:28 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

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

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

• Singular/mpr_base.cc (modified) (41 diffs)

Singular/mpr_base.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpr_base.cc,v 1.20 2000-03-01 14:00:05 Singular Exp $ */
+/* $Id: mpr_base.cc,v 1.21 2000-08-14 12:56:39 obachman Exp $ */
 
 /*
@@ -13 +13 @@
 
 #include "mod2.h"
+
+#include <omalloc.h>
 
 //-> includes
@@ -21 +23 @@
 #include "ipshell.h"
 #include "febase.h"
-#include "mmemory.h"
 #include "intvec.h"
 #include "matpol.h"
@@ -34 +35 @@
 #include "mpr_base.h"
 #include "mpr_numeric.h"
-#if HAVE_ASO == 10
-#include "mpr_base.aso"
-#else
-#define AllocSizeOf(X) Alloc(sizeof(X))
-#define FreeSizeOf(X,Y) Free(X,sizeof(Y))
-#endif
 //<-
 
@@ -335 +330 @@
 //<-
 
-#ifndef ASO_GENERATE
-
 //-> debug output stuff
 #if defined(mprDEBUG_PROT) || defined(mprDEBUG_ALL)
@@ -424 +417 @@
 {
   int i;
-  points = (onePointP *)Alloc( (count+1) * sizeof(onePointP) );
+  points = (onePointP *)omAlloc( (count+1) * sizeof(onePointP) );
   for ( i= 0; i <= max; i++ )
   {
-    points[i]= (onePointP)Alloc( sizeof(onePoint) );
-    points[i]->point= (Coord_t *)Alloc0( (dim+2) * sizeof(Coord_t) );
+    points[i]= (onePointP)omAlloc( sizeof(onePoint) );
+    points[i]->point= (Coord_t *)omAlloc0( (dim+2) * sizeof(Coord_t) );
   }
   lifted= false;
@@ -439 +432 @@
   for ( i= 0; i <= max; i++ )
   {
-    Free( (ADDRESS) points[i]->point, fdim * sizeof(Coord_t) );
-    Free( (ADDRESS) points[i], sizeof(onePoint) );
-  }
-  Free( (ADDRESS) points, (max+1) * sizeof(onePointP) );
+    omFreeSize( (ADDRESS) points[i]->point, fdim * sizeof(Coord_t) );
+    omFreeSize( (ADDRESS) points[i], sizeof(onePoint) );
+  }
+  omFreeSize( (ADDRESS) points, (max+1) * sizeof(onePointP) );
 }
 
@@ -457 +450 @@
     int i;
     int fdim= lifted ? dim+1 : dim+2;
-    points= (onePointP*)ReAlloc( points,
+    points= (onePointP*)omReallocSize( points,
                                  (max+1) * sizeof(onePointP),
                                  (2*max + 1) * sizeof(onePointP) );
     for ( i= max+1; i <= max*2; i++ )
     {
-      points[i]= (onePointP)Alloc( sizeof(struct onePoint) );
-      points[i]->point= (Coord_t *)Alloc0( fdim * sizeof(Coord_t) );
+      points[i]= (onePointP)omAlloc( sizeof(struct onePoint) );
+      points[i]->point= (Coord_t *)omAlloc0( fdim * sizeof(Coord_t) );
     }
     max*= 2;
@@ -563 +556 @@
   poly piter= p;
   Exponent_t * vert;
-  vert= (Exponent_t *)Alloc( (dim+1) * sizeof(Exponent_t) );
+  vert= (Exponent_t *)omAlloc( (dim+1) * sizeof(Exponent_t) );
 
   while ( piter )
@@ -583 +576 @@
     pIter( piter );
   }
-  Free( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
+  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
 }
 
@@ -592 +585 @@
 
   // hier unschoen...
-  vert= (Exponent_t *)Alloc( (dim+1) * sizeof(Exponent_t) );
+  vert= (Exponent_t *)omAlloc( (dim+1) * sizeof(Exponent_t) );
 
   pGetExpV( p, vert );
@@ -601 +594 @@
     if ( j > dim ) break;
   }
-  Free( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
+  omFreeSize( (ADDRESS) vert, (dim+1) * sizeof(Exponent_t) );
 
   if ( i > num ) return 0;
@@ -689 +682 @@
   {
     outerL= false;
-    l= (int *)Alloc( (dim+1) * sizeof(int) ); // [1..dim-1]
+    l= (int *)omAlloc( (dim+1) * sizeof(int) ); // [1..dim-1]
 
     for(i = 1; i < dim; i++)
@@ -722 +715 @@
   lifted= true;
 
-  if ( !outerL ) Free( (ADDRESS) l, (dim+1) * sizeof(int) );
+  if ( !outerL ) omFreeSize( (ADDRESS) l, (dim+1) * sizeof(int) );
 }
 //<-
@@ -792 +785 @@
 
   n= pVariables;
-  vert= (Exponent_t *)Alloc( (idelem+1) * sizeof(Exponent_t) );
-
-  Q = (pointSet **)Alloc( idelem * sizeof(pointSet*) );        // support hulls
+  vert= (Exponent_t *)omAlloc( (idelem+1) * sizeof(Exponent_t) );
+
+  Q = (pointSet **)omAlloc( idelem * sizeof(pointSet*) );        // support hulls
   for ( i= 0; i < idelem; i++ )
     Q[i] = new pointSet( pVariables, i+1, pLength((gls->m)[i])+1 );
@@ -821 +814 @@
   } // i
 
-  Free( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
+  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
 
 #ifdef mprDEBUG_PROT
@@ -852 +845 @@
 
   n= pVariables;
-  vert= (Exponent_t *)Alloc( (idelem+1) * sizeof(Exponent_t) );
+  vert= (Exponent_t *)omAlloc( (idelem+1) * sizeof(Exponent_t) );
   id= idInit( idelem, 1 );
 
@@ -885 +878 @@
   } // i
 
-  Free( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
+  omFreeSize( (ADDRESS) vert, (idelem+1) * sizeof(Exponent_t) );
 
 #ifdef mprDEBUG_PROT
@@ -1354 +1347 @@
   // remap results of LP to sets Qi
   c=0;
-  optSum= (setID*)Alloc( (LP->m) * sizeof(struct setID) );
+  optSum= (setID*)omAlloc( (LP->m) * sizeof(struct setID) );
   for ( i= 0; i < LP->m; i++ )
   {
@@ -1409 +1402 @@
 
   // clean up
-  Free( (ADDRESS) optSum, (LP->m) * sizeof(struct setID) );
+  omFreeSize( (ADDRESS) optSum, (LP->m) * sizeof(struct setID) );
 
   mprSTICKYPROT(ST_SPARSE_RC);
@@ -1430 +1423 @@
   Exponent_t *epp_mon, *eexp;
 
-  epp_mon= (Exponent_t *)Alloc( (n+2) * sizeof(Exponent_t) );
-  eexp= (Exponent_t *)Alloc0((pVariables+1)*sizeof(Exponent_t));
+  epp_mon= (Exponent_t *)omAlloc( (n+2) * sizeof(Exponent_t) );
+  eexp= (Exponent_t *)omAlloc0((pVariables+1)*sizeof(Exponent_t));
 
   totDeg= numSet0;
@@ -1438 +1431 @@
   mprSTICKYPROT2("  resultant deg: %d\n", numSet0);
 
-  uRPos= NewIntvec3( numSet0, pLength((gls->m)[0])+1, 0 );
+  uRPos= new intvec( numSet0, pLength((gls->m)[0])+1, 0 );
 
   // sparse Matrix represented as a module where
@@ -1489 +1482 @@
 
   pDelete( &epp );
-  Free( (ADDRESS) epp_mon, (n+2) * sizeof(Exponent_t) );
-  Free( (ADDRESS) eexp, (pVariables+1)*sizeof(Exponent_t));
+  omFreeSize( (ADDRESS) epp_mon, (n+2) * sizeof(Exponent_t) );
+  omFreeSize( (ADDRESS) eexp, (pVariables+1)*sizeof(Exponent_t));
 
 #ifdef mprDEBUG_ALL
@@ -1536 +1529 @@
   int j,k,l;
 
-  vert.point=(Coord_t*)Alloc( (pVariables+2) * sizeof(Coord_t) );
+  vert.point=(Coord_t*)omAlloc( (pVariables+2) * sizeof(Coord_t) );
 
   vs= new pointSet( dim );
@@ -1553 +1546 @@
   }
 
-  Free( (ADDRESS) vert.point, (pVariables+2) * sizeof(Coord_t) );
+  omFreeSize( (ADDRESS) vert.point, (pVariables+2) * sizeof(Coord_t) );
 
   return vs;
@@ -1725 +1718 @@
     delete Qi[i];
   }
-  Free( (ADDRESS) Qi, idelem * sizeof(pointSet*) );
+  omFreeSize( (ADDRESS) Qi, idelem * sizeof(pointSet*) );
 
   delete E;
@@ -2091 +2084 @@
         nDelete( resVectorList[i].numColVector+j );
     }
-    Free( (ADDRESS)resVectorList[i].numColVector, numVectors*sizeof( number ) );
-    Free( (ADDRESS)resVectorList[i].numColParNr, (pVariables+1) * sizeof(int) );
-  }
-
-  Free( (ADDRESS)resVectorList, veclistmax*sizeof( resVector ) );
+    // OB: ????? (solve_s.tst)
+    omfreeSize( (ADDRESS)resVectorList[i].numColVector, numVectors*sizeof( number ) );
+    omfreeSize( (ADDRESS)resVectorList[i].numColParNr, (pVariables+1) * sizeof(int) );
+  }
+
+  omFreeSize( (ADDRESS)resVectorList, veclistmax*sizeof( resVector ) );
 
   // free matrix m
@@ -2103 +2097 @@
       for ( j= 1; j <= numVectors; j++ )
         pDelete( &MATELEM(m , i, j) );
-    Free( (ADDRESS)m->m, numVectors * numVectors * sizeof(poly) );
-    FreeSizeOf( (ADDRESS)m, ip_smatrix );
+    omfreeSize( (ADDRESS)m->m, numVectors * numVectors * sizeof(poly) );
+    omFreeBin((ADDRESS)m,  ip_smatrix_bin);
   }
 }
@@ -2186 +2180 @@
     if ( numVectors == veclistmax )
     {
-      resVectorList= (resVector * )ReAlloc( resVectorList,
+      resVectorList= (resVector * )omReallocSize( resVectorList,
                                             (veclistmax) * sizeof( resVector ),
                                             (veclistmax + veclistblock) * sizeof( resVector ) );
@@ -2225 +2219 @@
   veclistblock= 512;
   veclistmax= veclistblock;
-  resVectorList= (resVector *)Alloc( veclistmax*sizeof( resVector ) );
+  resVectorList= (resVector *)omAlloc( veclistmax*sizeof( resVector ) );
 
   // Init resVector()s
@@ -2387 +2381 @@
       resVectorList[k].numColParNr= NULL;
       resVectorList[k].numColVectorSize= numVectors;
-      resVectorList[k].numColVector= (number *)Alloc( numVectors*sizeof( number ) );
+      resVectorList[k].numColVector= (number *)omAlloc( numVectors*sizeof( number ) );
       for ( i= 0; i < numVectors; i++ ) resVectorList[k].numColVector[i]= nInit(0);
 
@@ -2421 +2415 @@
       resVectorList[k].numColVectorSize= 0;
       resVectorList[k].numColVector= NULL;
-      resVectorList[k].numColParNr= (int *)Alloc0( (pVariables+1) * sizeof(int) );
+      resVectorList[k].numColParNr= (int *)omAlloc0( (pVariables+1) * sizeof(int) );
 
       pi= (gls->m)[ resVectorList[k].elementOfS ];
@@ -2451 +2445 @@
   // create the matrix M
   createMatrix();
+  
 }
 
@@ -2712 +2707 @@
 {
   ideal newGls= idCopy( gls );
-  newGls->m= (poly *)ReAlloc( newGls->m,
+  newGls->m= (poly *)omReallocSize( newGls->m,
                               IDELEMS(gls) * sizeof(poly),
                               (IDELEMS(gls) + 1) * sizeof(poly) );
@@ -2787 +2782 @@
   // we need mdg results of D(p0,p1,...,pn)
   number *presults;
-  presults= (number *)Alloc( mdg * sizeof( number ) );
+  presults= (number *)omAlloc( mdg * sizeof( number ) );
   for (i=0; i < mdg; i++) presults[i]= nInit(0);
 
-  number *pevpoint= (number *)Alloc( n * sizeof( number ) );
-  number *pev= (number *)Alloc( n * sizeof( number ) );
+  number *pevpoint= (number *)omAlloc( n * sizeof( number ) );
+  number *pev= (number *)omAlloc( n * sizeof( number ) );
   for (i=0; i < n; i++) pev[i]= nInit(0);
 
@@ -2930 +2925 @@
   //              c(0)*u0^tdg + c(1)*u0^tdg-1 + ... + c(tdg-1)*u0 + c(tdg)
   number *presults;
-  presults= (number *)Alloc( (tdg + 1) * sizeof( number ) );
+  presults= (number *)omAlloc( (tdg + 1) * sizeof( number ) );
   for ( i=0; i <= tdg; i++ ) presults[i]= nInit(0);
 
   rootContainer ** roots;
-  roots= (rootContainer **) Alloc( loops * sizeof(rootContainer*) );
+  roots= (rootContainer **) omAlloc( loops * sizeof(rootContainer*) );
   for ( i=0; i < loops; i++ ) roots[i]= new rootContainer(); // 0..n-2
 
-  number *pevpoint= (number *)Alloc( n * sizeof( number ) );
+  number *pevpoint= (number *)omAlloc( n * sizeof( number ) );
   for (i=0; i < n; i++) pevpoint[i]= nInit(0);
 
-  number *pev= (number *)Alloc( n * sizeof( number ) );
+  number *pev= (number *)omAlloc( n * sizeof( number ) );
   for (i=0; i < n; i++) pev[i]= nInit(0);
 
@@ -3046 +3041 @@
   // free some stuff: pev, presult
   for ( i=0; i < n; i++ ) nDelete( pev + i );
-  Free( (ADDRESS)pev, n * sizeof( number ) );
+  omFreeSize( (ADDRESS)pev, n * sizeof( number ) );
 
   for ( i=0; i <= tdg; i++ ) nDelete( presults+i );
-  Free( (ADDRESS)presults, (tdg + 1) * sizeof( number ) );
+  omFreeSize( (ADDRESS)presults, (tdg + 1) * sizeof( number ) );
 
   return roots;
@@ -3066 +3061 @@
 
   rootContainer ** roots;
-  roots= (rootContainer **) Alloc( loops * sizeof(rootContainer*) );
+  roots= (rootContainer **) omAlloc( loops * sizeof(rootContainer*) );
   for ( i=0; i < loops; i++ ) roots[i]= new rootContainer(); // 0..n-2
 
-  number *pevpoint= (number *)Alloc( n * sizeof( number ) );
+  number *pevpoint= (number *)omAlloc( n * sizeof( number ) );
   for (i=0; i < n; i++) pevpoint[i]= nInit(0);
 
@@ -3106 +3101 @@
     pures= resMat->getUDet( pevpoint );
 
-    number *ncpoly= (number *)Alloc( (tdg+1) * sizeof(number) );
+    number *ncpoly= (number *)omAlloc( (tdg+1) * sizeof(number) );
 
 #ifdef MPR_MASI
@@ -3159 +3154 @@
   // free some stuff: pev, presult
   for ( i=0; i < n; i++ ) nDelete( pevpoint + i );
-  Free( (ADDRESS)pevpoint, n * sizeof( number ) );
+  omFreeSize( (ADDRESS)pevpoint, n * sizeof( number ) );
 
   return roots;
@@ -3209 +3204 @@
 
 //-----------------------------------------------------------------------------
-
-#endif // ! ASO_GENERATE
 
 // local Variables: ***