Changeset 733b51 in git for kernel/linear_algebra/Minor.cc

Timestamp:

Mar 16, 2017, 4:29:28 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

f1cee38cd6cac02cfd2e0311e88e6d0feaf11505

Parents:

4fbbedd2f732aad850d2db9352ecc293ba229165

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-03-16 16:29:28+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-03-16 16:48:34+01:00

Message:

Minor*: allocation -> omalloc, removed unueed routines, code cleanup

also fixes memory leak for minor(poly-matrix,int,SB)

File:

• kernel/linear_algebra/Minor.cc (modified) (12 diffs)

kernel/linear_algebra/Minor.cc

@@ -15 +15 @@
   _numberOfRowBlocks = 0;
   _numberOfColumnBlocks = 0;
-  delete [] _rowKey;
-  delete [] _columnKey;
-  _rowKey = 0;
-  _columnKey = 0;
+  omFree(_rowKey);
+  _rowKey = NULL;
+  omFree(_columnKey);
+  _columnKey = NULL;
 }
 
@@ -27 +27 @@
 
   /* allocate memory for new entries in _rowKey and _columnKey */
-  _rowKey = new unsigned int[_numberOfRowBlocks];
-  _columnKey = new unsigned int[_numberOfColumnBlocks];
+  _rowKey = (unsigned*)omAlloc(_numberOfRowBlocks*sizeof(unsigned));
+  _columnKey = (unsigned*)omAlloc(_numberOfColumnBlocks*sizeof(unsigned));
 
   /* copying values from parameter arrays to private arrays */
@@ -39 +39 @@
 MinorKey& MinorKey::operator=(const MinorKey& mk)
 {
-  if (_numberOfRowBlocks != 0)    delete [] _rowKey;
-  if (_numberOfColumnBlocks != 0) delete [] _columnKey;
+  omfree(_rowKey); _rowKey = NULL;
+  omfree(_columnKey); _columnKey = NULL;
   _numberOfRowBlocks = 0;
   _numberOfColumnBlocks = 0;
-  _rowKey = 0;
-  _columnKey = 0;
 
   _numberOfRowBlocks = mk.getNumberOfRowBlocks();
@@ -50 +48 @@
 
   /* allocate memory for new entries in _rowKey and _columnKey */
-  _rowKey = new unsigned int[_numberOfRowBlocks];
-  _columnKey = new unsigned int[_numberOfColumnBlocks];
+  _rowKey = (unsigned*)omalloc(_numberOfRowBlocks*sizeof(unsigned));
+  _columnKey = (unsigned*)omalloc(_numberOfColumnBlocks*sizeof(unsigned));
 
   /* copying values from parameter arrays to private arrays */
@@ -67 +65 @@
 {
   /* free memory of _rowKey and _columnKey */
-  if (_numberOfRowBlocks > 0) { delete [] _rowKey; }
-  if (_numberOfColumnBlocks > 0) { delete [] _columnKey; }
+  if (_numberOfRowBlocks > 0) { omFree(_rowKey); }
+  if (_numberOfColumnBlocks > 0) { omFree(_columnKey); }
 
   _numberOfRowBlocks = lengthOfRowArray;
@@ -74 +72 @@
 
   /* allocate memory for new entries in _rowKey and _columnKey; */
-  _rowKey = new unsigned int[_numberOfRowBlocks];
-  _columnKey = new unsigned int[_numberOfColumnBlocks];
+  _rowKey = (unsigned*)omAlloc(_numberOfRowBlocks*sizeof(unsigned));
+  _columnKey = (unsigned*)omAlloc(_numberOfColumnBlocks*sizeof(unsigned));
 
   /* copying values from parameter arrays to private arrays */
@@ -93 +91 @@
 
   /* allocate memory for new entries in _rowKey and _columnKey */
-  _rowKey = new unsigned int[_numberOfRowBlocks];
-  _columnKey = new unsigned int[_numberOfColumnBlocks];
+  _rowKey = (unsigned*)omalloc(_numberOfRowBlocks*sizeof(unsigned));
+  _columnKey = (unsigned*)omalloc(_numberOfColumnBlocks*sizeof(unsigned));
 
   /* copying values from parameter arrays to private arrays */
@@ -108 +106 @@
   _numberOfRowBlocks = 0;
   _numberOfColumnBlocks = 0;
-  delete [] _rowKey;
-  delete [] _columnKey;
-  _rowKey = 0;
-  _columnKey = 0;
+  omfree(_rowKey); _rowKey = NULL;
+  omfree(_columnKey); _columnKey = NULL;
 }
 
@@ -487 +483 @@
   }
   /* free old memory */
-  delete [] _rowKey; _rowKey = 0;
+  omfree(_rowKey);
+  _rowKey = NULL;
   _numberOfRowBlocks = blockIndex + 1;
   /* allocate memory for new entries in _rowKey; */
-  _rowKey = new unsigned int[_numberOfRowBlocks];
+  _rowKey = (unsigned*)omAlloc(_numberOfRowBlocks*sizeof(unsigned));
   /* copying values from mk to this MinorKey */
   for (int r = 0; r < blockIndex; r++)
@@ -527 +524 @@
   }
   /* free old memory */
-  delete [] _columnKey; _columnKey = 0;
+  omfree(_columnKey); _columnKey = NULL;
   _numberOfColumnBlocks = blockIndex + 1;
   /* allocate memory for new entries in _columnKey; */
-  _columnKey = new unsigned int[_numberOfColumnBlocks];
+  _columnKey = (unsigned*)omAlloc(_numberOfColumnBlocks*sizeof(unsigned));
   /*  copying values from mk to this MinorKey */
   for (int c = 0; c < blockIndex; c++)
@@ -607 +604 @@
     { /* In this case, _rowKey is too small. */
       /* free old memory */
-      delete [] _rowKey; _rowKey = 0;
+      omFree(_rowKey); _rowKey = NULL;
       _numberOfRowBlocks = newBitBlockIndex + 1;
       /* allocate memory for new entries in _rowKey; */
-      _rowKey = new unsigned int[_numberOfRowBlocks];
+      _rowKey = (unsigned*)omAlloc(_numberOfRowBlocks*sizeof(unsigned));
       /* initializing entries to zero */
         for (int r = 0; r < _numberOfRowBlocks; r++) _rowKey[r] = 0;
@@ -739 +736 @@
     { /* In this case, _columnKey is too small. */
         /* free old memory */
-        delete [] _columnKey; _columnKey = 0;
+        omFree( _columnKey); _columnKey = NULL;
         _numberOfColumnBlocks = newBitBlockIndex + 1;
         /* allocate memory for new entries in _columnKey; */
-        _columnKey = new unsigned int[_numberOfColumnBlocks];
+        _columnKey = (unsigned*)omAlloc(_numberOfColumnBlocks*sizeof(unsigned));
         /* initializing entries to zero */
         for (int c = 0; c < _numberOfColumnBlocks; c++) _columnKey[c] = 0;