Changeset 836c32 in git

Timestamp:

Aug 23, 2016, 4:01:06 PM (7 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

74eafed4a90b880a02beba6665b920093bec6aa2

Parents:

353e59740153da5f7c66ce40ec97f46571896b9a

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2016-08-23 16:01:06+02:00

git-committer:

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

Message:

chg: simplify FindReducer()

File:

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

kernel/GBEngine/syz4.cc

@@ -343 +343 @@
     return NULL;
   }
-  long c = 0;
-  if (syzterm != NULL)
-    c = p_GetComp(syzterm, r) - 1;
-  const BOOLEAN to_check = !syz_checker->empty();
   const poly q = p_New(r);
   pNext(q) = NULL;
   const unsigned long m_not_sev = ~p_GetShortExpVector(multiplier, t, r);
-  while (true) {
-    for( ; m_current != m_finish; ++m_current) {
-      if ( !((*m_current)->sev & m_not_sev)
-          && _p_LmDivisibleByNoComp((*m_current)->lt, multiplier, t, r)) {
-        break;
-      }
-    }
-    if (m_current == m_finish) {
-      break;
+  for( ; m_current != m_finish; ++m_current) {
+    if ( ((*m_current)->sev & m_not_sev)
+        || !(_p_LmDivisibleByNoComp((*m_current)->lt, multiplier, t, r))) {
+      continue;
     }
     const poly p = (*m_current)->lt;
     const int k  = (*m_current)->label;
-    ++m_current;
     p_ExpVectorSum(q, multiplier, t, r); // q == product == multiplier * t
     p_ExpVectorDiff(q, q, p, r); // (LM(product) / LM(L[k]))
@@ -368 +358 @@
     p_Setm(q, r);
     // cannot allow something like: a*gen(i) - a*gen(i)
-    if (syzterm != NULL && (k == c))
-    if (p_ExpVectorEqual(syzterm, q, r)) {
+    if (syzterm != NULL && (k == p_GetComp(syzterm, r) - 1)
+        && p_ExpVectorEqual(syzterm, q, r)) {
       continue;
     }
-    if (to_check && IsDivisible(syz_checker, q)) {
+    if (IsDivisible(syz_checker, q)) {
       continue;
     }