Changeset 7d405ea in git

Timestamp:

Aug 16, 2018, 3:24:08 PM (5 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

f57a527ff5945269a660f068be0628fbd2af9a48

Parents:

2c1877bee39e18edce18852e793125bdfcafb3e0

Message:

optimization when generating new strong spairs can only be done if the monomial order is not mixed

File:

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

kernel/GBEngine/kutil.cc

@@ -1527 +1527 @@
   k_GetStrongLeadTerms(p, si, currRing, m1, m2, gcd, strat->tailRing);
 
-  unsigned long sev = pGetShortExpVector(gcd);
-
-  for (int j = 0; j < strat->sl; j++) {
-    if (j == i)
-      continue;
-
-    if (n_DivBy(d, pGetCoeff(strat->S[j]), currRing->cf) &&
-        !(strat->sevS[j] & ~sev) &&
-        p_LmDivisibleBy(strat->S[j], gcd, currRing)) {
-      nDelete(&d);
-      nDelete(&s);
-      nDelete(&t);
-      return FALSE;
+  if (!rHasMixedOrdering(currRing)) {
+    unsigned long sev = pGetShortExpVector(gcd);
+
+    for (int j = 0; j < strat->sl; j++) {
+      if (j == i)
+        continue;
+
+      if (n_DivBy(d, pGetCoeff(strat->S[j]), currRing->cf) &&
+          !(strat->sevS[j] & ~sev) &&
+          p_LmDivisibleBy(strat->S[j], gcd, currRing)) {
+        nDelete(&d);
+        nDelete(&s);
+        nDelete(&t);
+        return FALSE;
+      }
     }
   }
@@ -1601 +1603 @@
   h.pCleardenom();
   strat->initEcart(&h);
-  h.sev = sev;
+  h.sev = pGetShortExpVector(h.p);
   h.i_r1 = -1;h.i_r2 = -1;
   if (currRing!=strat->tailRing)