Changeset c232af in git for Singular/intvec.cc

Timestamp:

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

Author:

Olaf Bachmann <obachman@…>

Branches:

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

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

• Singular/intvec.cc (modified) (18 diffs)

Singular/intvec.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: intvec.cc,v 1.16 1999-11-15 17:20:07 obachman Exp $ */
+/* $Id: intvec.cc,v 1.17 2000-08-14 12:56:21 obachman Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -12 +12 @@
 #include "febase.h"
 #include "intvec.h"
-#include "mmemory.h"
+#include <omalloc.h>
 
 /*0 implementation*/
 
-#ifdef MDEBUG
-intvec::intvec(char* file, int line, int l)
-{
-  v = (int *)mmDBAllocBlock0(sizeof(int)*l, file, line);
-  row = l;
-  col = 1;
-}
-
-intvec::intvec(char* file, int line, intvec* iv)
+
+intvec::intvec(intvec* iv)
 {
   row = iv->rows();
   col = iv->cols();
-  v   = (int *)mmDBAllocBlock(sizeof(int)*row*col, file, line);
+  v   = (int *)omAlloc(sizeof(int)*row*col);
   for (int i=0; i<row*col; i++)
   {
@@ -35 +28 @@
 }
 
-intvec::intvec(char* file, int line, int s, int e)
+intvec::intvec(int s, int e)
 {
   int inc;
@@ -49 +42 @@
     inc = -1;
   }
-  v = (int *)mmDBAllocBlock(sizeof(int)*row, file, line);
+  v = (int *)omAlloc(sizeof(int)*row);
   for (int i=0; i<row; i++)
   {
@@ -57 +50 @@
 }
 
-intvec::intvec(char* file, int line, int r, int c, int init)
+intvec::intvec(int r, int c, int init)
 {
   row = r;
@@ -63 +56 @@
   int l = r*c;
   if ((r>0) && (c>0))
-    v = (int *)mmDBAllocBlock(sizeof(int)*l, file, line);
-  else
-    v = NULL;
-  for (int i=0; i<l; i++)
-  {
-    v[i] = init;
-  }
-}
-
-#endif // ! MDEBUG
-
-
-intvec::intvec(intvec* iv)
-{
-  row = iv->rows();
-  col = iv->cols();
-  v   = (int *)Alloc(sizeof(int)*row*col);
-  for (int i=0; i<row*col; i++)
-  {
-    v[i] = (*iv)[i];
-  }
-}
-
-intvec::intvec(int s, int e)
-{
-  int inc;
-  col = 1;
-  if (s<e)
-  {
-    row =  e-s+1;
-    inc =  1;
-  }
-  else
-  {
-    row = s-e+1;
-    inc = -1;
-  }
-  v = (int *)Alloc(sizeof(int)*row);
-  for (int i=0; i<row; i++)
-  {
-    v[i] = s;
-    s+=inc;
-  }
-}
-
-intvec::intvec(int r, int c, int init)
-{
-  row = r;
-  col = c;
-  int l = r*c;
-  if ((r>0) && (c>0))
-    v = (int *)Alloc(sizeof(int)*l);
+    v = (int *)omAlloc(sizeof(int)*l);
   else
     v = NULL;
@@ -169 +111 @@
 {
   assume(new_length > 0 && col == 1);
-  v = (int*) ReAlloc0(v, row*sizeof(int), new_length*sizeof(int));
+  v = (int*) omRealloc0Size(v, row*sizeof(int), new_length*sizeof(int));
   row = new_length;
 }
@@ -175 +117 @@
 char * intvec::String(int dim)
 {
-  return mstrdup(ivString(0, 0, dim));
+  return omStrDup(ivString(0, 0, dim));
 }
 
@@ -260 +202 @@
 intvec * ivCopy(intvec * o)
 {
-  intvec * iv=NewIntvecIv(o);
+  intvec * iv=new intvec(o);
   return iv;
 }
@@ -273 +215 @@
   if (a->cols() == 1)
   {
-    iv = NewIntvec1(ma);
+    iv = new intvec(ma);
     for (i=0; i<mn; i++) (*iv)[i] = (*a)[i] + (*b)[i];
     if (ma > mn)
@@ -289 +231 @@
   }
   if (mn != ma) return NULL;
-  iv = NewIntvec1(a);
+  iv = new intvec(a);
   for (i=0; i<mn*a->cols(); i++) { (*iv)[i] += (*b)[i]; }
   return iv;
@@ -303 +245 @@
   if (a->cols() == 1)
   {
-    iv = NewIntvec1(ma);
+    iv = new intvec(ma);
     for (i=0; i<mn; i++) (*iv)[i] = (*a)[i] - (*b)[i];
     if (ma > mn)
@@ -319 +261 @@
   }
   if (mn != ma) return NULL;
-  iv = NewIntvec1(a);
+  iv = new intvec(a);
   for (i=0; i<mn*a->cols(); i++) { (*iv)[i] -= (*b)[i]; }
   return iv;
@@ -327 +269 @@
 {
   int i, j, r = o->rows(), c = o->cols();
-  intvec * iv= NewIntvec3(c, r, 0);
+  intvec * iv= new intvec(c, r, 0);
   for (i=0; i<r; i++)
   {
@@ -353 +295 @@
   intvec * iv;
   if (ca != rb) return NULL;
-  iv = NewIntvec3(ra, cb, 0);
+  iv = new intvec(ra, cb, 0);
   for (i=0; i<ra; i++)
   {
@@ -472 +414 @@
 static intvec * ivIndepCols(intvec * imat)
 {
-  intvec * result=NewIntvec3(1,imat->cols(),0);
+  intvec * result=new intvec(1,imat->cols(),0);
   int i,j;
 
@@ -489 +431 @@
 static intvec * ivBasicSol(intvec * imat)
 {
-  intvec * result = NewIntvec3(2*imat->cols(),imat->cols(),0);
-  intvec * indep=ivIndepCols(imat),*actsol=NewIntvec1(imat->cols());
+  intvec * result = new intvec(2*imat->cols(),imat->cols(),0);
+  intvec * indep=ivIndepCols(imat),*actsol=new intvec(imat->cols());
   int actPosSol=1,actNegSol=imat->cols()+1,i=imat->cols(),j,k;
   int tgcd,tlcm;
@@ -552 +494 @@
 intvec * ivSolveIntMat(intvec * imat)
 {
-  intvec * result=NewIntvec1(imat->cols());
+  intvec * result=new intvec(imat->cols());
   intvec * basesol=ivBasicSol(imat);
   int i=imat->cols(),j,k,l,t;