Changeset e7be12 in git

Timestamp:

Feb 1, 2018, 9:01:55 AM (6 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

142d6830a2e36c68a435217a327b8c40dfe7c89ee12c6cc0e47b23782a596a19dd9b135d5c34120b

Parents:

eb2c7db0175de4726fef063bb07af0fa7ffb9390

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2018-02-01 09:01:55+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2018-02-02 11:16:48+01:00

Message:

chg: restructure computeResolution()

File:

• kernel/GBEngine/syz4.cc (modified) (4 diffs)

kernel/GBEngine/syz4.cc

@@ -50 +50 @@
  * used to determine lower order terms.
  */
-static inline bool check_variables(const std::vector<bool> variables,
+static inline bool check_variables(const std::vector<bool> &variables,
         const poly m)
 {
@@ -527 +527 @@
  */
 static void computeLiftings(const resolvente res, const int index,
-        std::vector<bool> &variables)
+        const std::vector<bool> &variables)
 {
 #if CACHE
@@ -610 +610 @@
                 delete_tails(res, index-1);
             }
-            update_variables(variables, res[index]);
             // we don't know if the input is a reduced SB:
             if (index == 1) {
                 variables[currRing->N] = false;
             }
+            update_variables(variables, res[index]);
             if (use_tensor_trick) {
                 delete_variables(res, index, variables);
@@ -634 +634 @@
         const bool single_module, const bool use_tensor_trick)
 {
+    if (idIs0(res[0])) {
+        return 1;
+    }
+    std::vector<bool> variables;
+    variables.resize(currRing->N+1, true);
+    if (do_lifting) {
+        update_variables(variables, res[0]);
+        if (use_tensor_trick) {
+            delete_variables(res, 0, variables);
+        }
+    }
     int index = 0;
-    if (!idIs0(res[0]) && 0 < max_index) {
-        index++;
+    if (max_index > 0) {
         res[1] = computeFrame(res[0], syzM_i_unsorted, syzHead);
-        std::vector<bool> variables;
-        variables.resize(currRing->N+1, true);
-        if (do_lifting) {
-            update_variables(variables, res[0]);
-            if (use_tensor_trick) {
-                delete_variables(res, 0, variables);
-            }
-        }
         index = computeResolution_iteration(res, max_index, syzHead,
                 do_lifting, single_module, use_tensor_trick, variables);
-        variables.clear();
-    }
+    }
+    variables.clear();
     return index+1;
 }