Changeset f45a05 in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

761d138c5d0b361d6a879874157b74198c2f4acb

Parents:

6d6c8d7133c387ddb4790a04d3358688ffbc6b3a

Message:

code cleanup for minor

Files:

• kernel/linear_algebra/MinorInterface.cc (modified) (3 diffs)
• libpolys/polys/linalg_from_matpol.cc (modified) (2 diffs)
• libpolys/polys/matpol.cc (modified) (1 diff)

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;

libpolys/polys/linalg_from_matpol.cc

@@ -14 +14 @@
 static void mp_SwapRow(matrix, int, int, int, const ring);
 static void mp_SwapCol(matrix, int, int, int, const ring);
-static void mp_ElimBar(matrix, matrix, poly, int, int, const ring);
 
 /*2
@@ -915 +914 @@
   return d;
 }
-
-static void mp_ElimBar(matrix a0, matrix re, poly div, int lr, int lc, const ring R)
-{
-  int r=lr-1, c=lc-1;
-  poly *b = a0->m, *x = re->m;
-  poly piv, elim, q1, q2, *ap, *a, *q;
-  int i, j;
-
-  ap = &b[r*a0->ncols];
-  piv = ap[c];
-  for(j=c-1; j>=0; j--)
-    if (ap[j] != NULL) ap[j] = p_Neg(ap[j], R);
-  for(i=r-1; i>=0; i--)
-  {
-    a = &b[i*a0->ncols];
-    q = &x[i*re->ncols];
-    if (a[c] != NULL)
-    {
-      elim = a[c];
-      for (j=c-1; j>=0; j--)
-      {
-        q1 = NULL;
-        if (a[j] != NULL)
-        {
-          q1 = SM_MULT(a[j], piv, div, R);
-          if (ap[j] != NULL)
-          {
-            q2 = SM_MULT(ap[j], elim, div, R);
-            q1 = p_Add_q(q1,q2, R);
-          }
-        }
-        else if (ap[j] != NULL)
-          q1 = SM_MULT(ap[j], elim, div, R);
-        if (q1 != NULL)
-        {
-          if (div)
-            SM_DIV(q1, div, R);
-          q[j] = q1;
-        }
-      }
-    }
-    else
-    {
-      for (j=c-1; j>=0; j--)
-      {
-        if (a[j] != NULL)
-        {
-          q1 = SM_MULT(a[j], piv, div, R);
-          if (div)
-            SM_DIV(q1, div, R);
-          q[j] = q1;
-        }
-      }
-    }
-  }
-}
-

libpolys/polys/matpol.cc

@@ -1217 +1217 @@
   {
     res = (float)n_Size(pGetCoeff(p),r->cf);
-    for (i=rVar(r);i>0;i--)
+    for (i=r->N;i>0;i--)
     {
       if(p_GetExp(p,i,r)!=0)