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

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

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

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/MinorInterface.cc (modified) (21 diffs)

kernel/linear_algebra/MinorInterface.cc

@@ -19 +19 @@
 
 using namespace std;
-
-static inline bool currRingIsOverIntegralDomain ()
-{
-  return rField_is_Domain(currRing);
-}
-
-bool currRingIsOverField ()
-{
-  if (rField_is_Ring_PtoM(currRing)) return false;
-  if (rField_is_Ring_2toM(currRing)) return false;
-  if (rField_is_Ring_ModN(currRing)) return false;
-  if (rField_is_Ring_Z(currRing))    return false;
-  return true;
-}
 
 /* returns true iff the given polyArray has only number entries;
@@ -53 +39 @@
   {
     nfPolyArray[i] = pCopy(polyArray[i]);
-    if (iSB != 0) nfPolyArray[i] = kNF(iSB, currRing->qideal, nfPolyArray[i]);
+    if (iSB != NULL)
+    {
+      poly tmp = kNF(iSB, currRing->qideal, nfPolyArray[i]);
+      pDelete(&nfPolyArray[i]);
+      nfPolyArray[i]=tmp;
+    }
     if (nfPolyArray[i] == NULL)
     {
@@ -91 +82 @@
   IntMinorProcessor mp;
   mp.defineMatrix(rowCount, columnCount, intMatrix);
-  int *myRowIndices=new int[rowCount];
+  int *myRowIndices=(int*)omAlloc(rowCount*sizeof(int));
   for (int j = 0; j < rowCount; j++) myRowIndices[j] = j;
-  int *myColumnIndices=new int[columnCount];
+  int *myColumnIndices=(int*)omAlloc(columnCount*sizeof(int));
   for (int j = 0; j < columnCount; j++) myColumnIndices[j] = j;
   mp.defineSubMatrix(rowCount, myRowIndices, columnCount, myColumnIndices);
@@ -129 +120 @@
   else                      jjj = idCopyFirstK(iii, collectedMinors);
   idDelete(&iii);
-  delete[] myColumnIndices;
-  delete[] myRowIndices;
+  omFree(myColumnIndices);
+  omFree(myRowIndices);
   return jjj;
 }
@@ -146 +137 @@
   PolyMinorProcessor mp;
   mp.defineMatrix(rowCount, columnCount, polyMatrix);
-  int *myRowIndices=new int[rowCount];
+  int *myRowIndices=(int*)omAlloc(rowCount*sizeof(int));
   for (int j = 0; j < rowCount; j++) myRowIndices[j] = j;
-  int *myColumnIndices=new int[columnCount];
+  int *myColumnIndices=(int*)omAlloc(columnCount*sizeof(int));
   for (int j = 0; j < columnCount; j++) myColumnIndices[j] = j;
   mp.defineSubMatrix(rowCount, myRowIndices, columnCount, myColumnIndices);
@@ -191 +182 @@
      in iii which come after the computed minors */
   idKeepFirstK(iii, collectedMinors);
-  delete[] myColumnIndices;
-  delete[] myRowIndices;
+  omFree(myColumnIndices);
+  omFree(myRowIndices);
   return(iii);
 }
@@ -208 +199 @@
   /* divert to special implementations for pure number matrices and actual
      polynomial matrices: */
-  int*  myIntMatrix  = new int [rowCount * columnCount];
-  poly* nfPolyMatrix = new poly[rowCount * columnCount];
+  int*  myIntMatrix  = (int*)omAlloc(rowCount * columnCount *sizeof(int));
+  poly* nfPolyMatrix = (poly*)omAlloc(rowCount * columnCount *sizeof(poly));
   if (arrayIsNumberArray(myPolyMatrix, i, rowCount * columnCount,
                          myIntMatrix, nfPolyMatrix, zz))
@@ -235 +226 @@
 
   /* clean up */
-  delete [] myIntMatrix;
+  omFree(myIntMatrix);
   for (int j = 0; j < rowCount * columnCount; j++) pDelete(&nfPolyMatrix[j]);
-  delete [] nfPolyMatrix;
+  omFree(nfPolyMatrix);
 
   return iii;
@@ -279 +270 @@
      (if iSB is present, i.e., not the NULL pointer) */
 
-    poly* nfPolyMatrix = new poly[length];
+    poly* nfPolyMatrix = (poly*)omAlloc(length*sizeof(poly));
     if (iSB != NULL)
     {
@@ -299 +290 @@
     /* clean up */
     for (int j = length-1; j>=0; j--) pDelete(&nfPolyMatrix[j]);
-    delete [] nfPolyMatrix;
+    omFree(nfPolyMatrix);
   }
 
@@ -320 +311 @@
   IntMinorProcessor mp;
   mp.defineMatrix(rowCount, columnCount, intMatrix);
-  int *myRowIndices=new int[rowCount];
+  int *myRowIndices=(int*)omAlloc(rowCount*sizeof(int));
   for (int j = 0; j < rowCount; j++) myRowIndices[j] = j;
-  int *myColumnIndices=new int[columnCount];
+  int *myColumnIndices=(int*)omAlloc(columnCount*sizeof(int));
   for (int j = 0; j < columnCount; j++) myColumnIndices[j] = j;
   mp.defineSubMatrix(rowCount, myRowIndices, columnCount, myColumnIndices);
@@ -360 +351 @@
   else                      jjj = idCopyFirstK(iii, collectedMinors);
   idDelete(&iii);
-  delete[] myColumnIndices;
-  delete[] myRowIndices;
+  omFree(myColumnIndices);
+  omFree(myRowIndices);
   return jjj;
 }
@@ -378 +369 @@
   PolyMinorProcessor mp;
   mp.defineMatrix(rowCount, columnCount, polyMatrix);
-  int *myRowIndices=new int[rowCount];
+  int *myRowIndices=(int*)omAlloc(rowCount*sizeof(int));
   for (int j = 0; j < rowCount; j++) myRowIndices[j] = j;
-  int *myColumnIndices=new int[columnCount];
+  int *myColumnIndices=(int*)omAlloc(columnCount*sizeof(int));
   for (int j = 0; j < columnCount; j++) myColumnIndices[j] = j;
   mp.defineSubMatrix(rowCount, myRowIndices, columnCount, myColumnIndices);
@@ -428 +419 @@
   else                      jjj = idCopyFirstK(iii, collectedMinors);
   idDelete(&iii);
-  delete[] myColumnIndices;
-  delete[] myRowIndices;
+  omFree(myColumnIndices);
+  omFree(myRowIndices);
   return jjj;
 }
@@ -446 +437 @@
   /* divert to special implementation when myPolyMatrix has only number
      entries: */
-  int*  myIntMatrix  = new int [rowCount * columnCount];
-  poly* nfPolyMatrix = new poly[rowCount * columnCount];
+  int*  myIntMatrix  = (int*)omAlloc(rowCount * columnCount *sizeof(int));
+  poly* nfPolyMatrix = (poly*)omAlloc(rowCount * columnCount *sizeof(poly));
   if (arrayIsNumberArray(myPolyMatrix, iSB, rowCount * columnCount,
                          myIntMatrix, nfPolyMatrix, zz))
@@ -459 +450 @@
 
   /* clean up */
-  delete [] myIntMatrix;
+  omFree(myIntMatrix);
   for (int j = 0; j < rowCount * columnCount; j++) pDelete(&nfPolyMatrix[j]);
-  delete [] nfPolyMatrix;
+  omFree(nfPolyMatrix);
 
   return iii;
@@ -480 +471 @@
   poly* myPolyMatrix = (poly*)(mat->m);
   int length = rowCount * columnCount;
-  poly* nfPolyMatrix = new poly[length];
+  poly* nfPolyMatrix = (poly*)omAlloc(length*sizeof(poly));
   ideal iii; /* the ideal to be filled and returned */
 
@@ -487 +478 @@
   for (int i = 0; i < length; i++)
   {
-    nfPolyMatrix[i] = pCopy(myPolyMatrix[i]);
-    if (iSB != 0) nfPolyMatrix[i] = kNF(iSB, currRing->qideal,
-                                        nfPolyMatrix[i]);
+    if (iSB==NULL)
+      nfPolyMatrix[i] = pCopy(myPolyMatrix[i]);
+    else
+      nfPolyMatrix[i] = kNF(iSB, currRing->qideal, myPolyMatrix[i]);
   }
 
@@ -498 +490 @@
   /* clean up */
   for (int j = 0; j < length; j++) pDelete(&nfPolyMatrix[j]);
-  delete [] nfPolyMatrix;
+  omFree(nfPolyMatrix);
 
   return iii;
@@ -534 +526 @@
   bool l = false; /* Laplace without caching */
   // bool c = false; /* Laplace with caching */
-  if (currRingIsOverIntegralDomain())
+  if (rField_is_Domain(currRing))
   { /* the field case or ring Z */
     if      (minorSize <= 2)                                     b = true;
     else if (vars <= 2)                                          b = true;
-    else if (currRingIsOverField() && (vars == 3)
+    else if ((!rField_is_Ring(currRing)) && (vars == 3)
              && (currRing->cf->ch >= 2) && (currRing->cf->ch <= NV_MAX_PRIME))
           b = true;
@@ -547 +539 @@
     else
     { /* k == 0, i.e., all minors are requested */
-      int minorCount = binom(rowCount, minorSize);
-      minorCount *= binom(columnCount, minorSize);
-      // if      ((minorSize >= 3) && (vars <= 4)
-      //          && (minorCount >= 100))                           c = true;
-      // else if ((minorSize >= 3) && (vars >= 5)
-      //          && (minorCount >= 40))                            c = true;
-      /*else*/                                                      l = true;
+      l = true;
     }
   }