Changeset b0a811 in git

Timestamp:

Jan 9, 2013, 4:12:24 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

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

Children:

ae78cf6564485cf2bbbd730e599efd2c029214e3

Parents:

c81bf79ced86ab51e160b984ca42699ac44228a0

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-01-09 16:12:24+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-02-19 20:27:28+01:00

Message:

chg: incorporate some suggestions by Hans

Conflicts:
	kernel/ideals.cc

Files:

• Singular/MinorInterface.cc (modified) (1 diff)
• kernel/ideals.cc (modified) (5 diffs)

Singular/MinorInterface.cc

@@ -539 +539 @@
     else
     { /* k == 0, i.e., all minors are requested */
-      long 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;

kernel/ideals.cc

@@ -12 +12 @@
 #include <omalloc/omalloc.h>
 #include <misc/auxiliary.h>
-
 
 #ifndef NDEBUG
@@ -2576 +2575 @@
 static int tCompare(const poly a, const poly b)
 {
-  if (b == NULL)
-  {
-    if (a == NULL) return(0);
-
-    return(1);
-  }
-
+  if (b == NULL) return(a != NULL);
   if (a == NULL) return(-1);
 
@@ -2648 +2641 @@
   for (int j = 1; j < idsize; j++)
   {
-    if (pEqualPolys(id_sort[i].p, id_sort[j].p))
+    if (id_sort[i].p != NULL && pEqualPolys(id_sort[i].p, id_sort[j].p))
     {
       index_i = id_sort[i].index;
@@ -2661 +2654 @@
         i = j;
       }
-      if (id->m[index] != NULL) {
-        pDelete(&id->m[index]);
-      }
+      pDelete(&id->m[index]);
     }
     else
@@ -2672 +2663 @@
   omFreeSize((ADDRESS)(id_sort), idsize*sizeof(poly_sort));
 }
-