Changeset 73460e in git

Timestamp:

Apr 26, 2016, 3:15:26 PM (8 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

99c74f3ed026dfaf783fdac2f85e2b6e18227089

Parents:

adc9531df1d439258c957d9547102094a1f33d31

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-04-26 15:15:26+02:00

git-committer:

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

Message:

add: implement sorting of the M_i

File:

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

kernel/GBEngine/syz4.cc

@@ -127 +127 @@
 }
 
+#define SORT_MI 1
+
+#if SORT_MI
+static int compare_Mi(const void* a, const void *b)
+{
+    const ring r = currRing;
+    poly p_a = *((poly *)a);
+    poly p_b = *((poly *)b);
+    int cmp;
+    int deg_a = p_Deg(p_a, r);
+    int deg_b = p_Deg(p_b, r);
+    cmp = (deg_a > deg_b) - (deg_a < deg_b);
+    if (cmp != 0) {
+         return cmp;
+    }
+    int comp_a = p_GetComp(p_a, r);
+    int comp_b = p_GetComp(p_b, r);
+    cmp = (comp_a > comp_b) - (comp_a < comp_b);
+    if (cmp != 0) {
+         return cmp;
+    }
+    int exp_a[r->N+1];
+    int exp_b[r->N+1];
+    p_GetExpV(p_a, exp_a, r);
+    p_GetExpV(p_b, exp_b, r);
+    for (int i = r->N; i > 0; i--) {
+        cmp = (exp_a[i] > exp_b[i]) - (exp_a[i] < exp_b[i]);
+        if (cmp != 0) {
+            return cmp;
+        }
+    }
+    return 0;
+}
+#endif   // SORT_MI
+
 static ideal computeFrame(const ideal G, const syzM_i_Function syzM_i,
     const syzHeadFunction *syzHead)
@@ -142 +177 @@
     }
     omFree(M);
+#if SORT_MI
+    qsort(frame->m, IDELEMS(frame), sizeof(poly), compare_Mi);
+#endif
     return frame;
 }