Changeset c1d8f3e in git

Timestamp:

Aug 25, 2016, 6:01:32 PM (7 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

a7e3139c235d2ec2c8be9bb6baef444e4df65332

Parents:

4c6e9d4ea46ef519f4c5e60541f5dbd83e8cc656

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-08-25 18:01:32+02:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2017-12-15 12:17:07+01:00

Message:

fix: handle syStrategy->length correctly in fres()

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/GBEngine/syz4.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -2209 +2209 @@
         return TRUE;
     }
-    maxl--;
-    if (maxl == -1) {
-        maxl = currRing->N;
+    if (maxl == 0) {
+        maxl = currRing->N+1;
         if (currRing->qideal != NULL) {
             Warn("full resolution in a qring may be infinite, "
-                "setting max length to %d", maxl+1);
+                "setting max length to %d", maxl);
         }
     }
@@ -2226 +2225 @@
     syStrategy r;
     r = syFrank(id, maxl, method);
-    r->list_length = maxl+1;
+    r->list_length = maxl;
     if (r == NULL) return TRUE;
     assume( (r->minres != NULL) || (r->fullres != NULL) );

kernel/GBEngine/syz4.cc

@@ -673 +673 @@
     const syzHeadFunction *syzHead)
 {
+    int max_index = length-1;
     int index = 0;
-    if (!idIs0(res[index]) && index < length) {
+    if (!idIs0(res[index]) && index < max_index) {
         index++;
         res[index] = computeFrame(res[index-1], syzM_i_unsorted, syzHead);
-    }
-    while (!idIs0(res[index]) && index < length) {
+        while (!idIs0(res[index])) {
 #if 1
-        computeLiftings(res, index);
-        sortPolysTails(res, index);
+            computeLiftings(res, index);
+            sortPolysTails(res, index);
 #endif   // LIFT
-        index++;
-        res[index] = computeFrame(res[index-1], syzM_i_sorted, syzHead);
-    }
-    if (index < length) {
+            if (index < max_index) {
+                index++;
+                res[index] = computeFrame(res[index-1], syzM_i_sorted,
+                    syzHead);
+            }
+            else {
+                break;
+            }
+        }
+    }
+    max_index = index+1;
+    if (max_index < length) {
         res = (resolvente)omReallocSize(res, (length+1)*sizeof(ideal),
-            (index+1)*sizeof(ideal));
-    }
-    return index;
+            (max_index+1)*sizeof(ideal));
+    }
+    return max_index;
 }
 
@@ -696 +704 @@
 {
     const ring r = currRing;
-    for (int i = length; i > 0; i--) {
+    for (int i = length-1; i > 0; i--) {
         for (int j = res[i]->ncols-1; j >= 0; j--) {
             res[i]->m[j] = p_SortAdd(res[i]->m[j], r, TRUE);
@@ -731 +739 @@
 
     result->fullres = res;
-    result->length = length+1;
+    result->length = length;
     return result;
 }