Changeset e78f35 in git for Singular/MinorInterface.cc

Timestamp:

Feb 19, 2013, 8:32:57 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2a3743b6431021631dff0bb9d7b7888a205302b1bc03ea6301177ce6360abcfc3922ff0edc5f9a73

Parents:

26e817f3b4db82c0b0a5376b16c2e9648ecf55e3d81e39d347055cad093a2ae53302e036ae2a449c

Message:

Merge pull request #280 from malex984/adapting_commits_from_master_minors

Adapting commits from master minors

File:

• Singular/MinorInterface.cc (modified) (2 diffs)

Singular/MinorInterface.cc

@@ -190 +190 @@
   /* before we return the result, let's omit zero generators
      in iii which come after the computed minors */
-  ideal jjj;
-  if (collectedMinors == 0) jjj = idInit(1);
-  else                      jjj = idCopyFirstK(iii, collectedMinors);
-  idDelete(&iii);
+  idKeepFirstK(iii, collectedMinors);
   delete[] myColumnIndices;
   delete[] myRowIndices;
-  return jjj;
+  return(iii);
 }
 
@@ -542 +539 @@
     else
     { /* k == 0, i.e., all minors are requested */
-      int minorCount = 1;
-      for (int i = rowCount - minorSize + 1; i <= rowCount; i++)
-        minorCount = minorCount * i;
-      for (int i = 2; i <= minorSize; i++) minorCount = minorCount / i;
-      for (int i = columnCount - minorSize + 1; i <= columnCount; i++)
-        minorCount = minorCount * i;
-      for (int i = 2; i <= minorSize; i++) minorCount = minorCount / i;
-      /* now: minorCount =   (rowCount over minorSize)
-                           * (columnCount over minorSize) */
+      int minorCount = binom(rowCount, minorSize);
+      minorCount *= binom(columnCount, minorSize);
       if      ((minorSize >= 3) && (vars <= 4)
                && (minorCount >= 100))                           c = true;