Changeset f45a05 in git for kernel/linear_algebra

Timestamp:

Mar 9, 2017, 3:39:05 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

761d138c5d0b361d6a879874157b74198c2f4acb

Parents:

6d6c8d7133c387ddb4790a04d3358688ffbc6b3a

Message:

code cleanup for minor

File:

• kernel/linear_algebra/MinorInterface.cc (modified) (3 diffs)

kernel/linear_algebra/MinorInterface.cc

@@ -20 +20 @@
 using namespace std;
 
-bool currRingIsOverIntegralDomain ()
-{
-  if (rField_is_Ring_PtoM(currRing)) return false;
-  if (rField_is_Ring_2toM(currRing)) return false;
-  if (rField_is_Ring_ModN(currRing)) return false;
-  return true;
+static inline bool currRingIsOverIntegralDomain ()
+{
+  return rField_is_Domain(currRing);
 }
 
@@ -263 +260 @@
   poly* myPolyMatrix = (poly*)(mat->m);
   int length = rowCount * columnCount;
-  poly* nfPolyMatrix = new poly[length];
   ideal iii; /* the ideal to be filled and returned */
 
-  /* copy all polynomials and reduce them w.r.t. iSB
-     (if iSB is present, i.e., not the NULL pointer) */
-  if (iSB != NULL)
-  {
-    for (int i = 0; i < length; i++)
-    {
-      nfPolyMatrix[i] = kNF(iSB, currRing->qideal,myPolyMatrix[i]);
-    }
-  }
-  else
-  {
-    for (int i = 0; i < length; i++)
-    {
-      nfPolyMatrix[i] = pCopy(myPolyMatrix[i]);
-    }
-  }
-
   if ((k == 0) && (strcmp(algorithm, "Bareiss") == 0)
-      && (!rField_is_Ring_Z(currRing)) && (!allDifferent))
+      && (!rField_is_Ring(currRing)) && (!allDifferent))
   {
     /* In this case, we call an optimized procedure, dating back to
@@ -292 +271 @@
        - coefficients come from a field (i.e., the ring Z is not
          allowed for this implementation). */
-    iii = (iSB == 0 ? idMinors(mat, minorSize) : idMinors(mat, minorSize,
+    iii = (iSB == NULL ? idMinors(mat, minorSize) : idMinors(mat, minorSize,
                                                           iSB));
   }
   else
   {
+  /* copy all polynomials and reduce them w.r.t. iSB
+     (if iSB is present, i.e., not the NULL pointer) */
+
+    poly* nfPolyMatrix = new poly[length];
+    if (iSB != NULL)
+    {
+      for (int i = 0; i < length; i++)
+      {
+        nfPolyMatrix[i] = kNF(iSB, currRing->qideal,myPolyMatrix[i]);
+      }
+    }
+    else
+    {
+      for (int i = 0; i < length; i++)
+      {
+        nfPolyMatrix[i] = pCopy(myPolyMatrix[i]);
+      }
+    }
     iii = getMinorIdeal_Poly(nfPolyMatrix, rowCount, columnCount, minorSize,
                              k, algorithm, iSB, allDifferent);
-  }
-
-  /* clean up */
-  for (int j = 0; j < length; j++) pDelete(&nfPolyMatrix[j]);
-  delete [] nfPolyMatrix;
+
+    /* clean up */
+    for (int j = length-1; j>=0; j--) pDelete(&nfPolyMatrix[j]);
+    delete [] nfPolyMatrix;
+  }
 
   return iii;