Changeset d4cec6a in git for libpolys/polys/shiftop.cc

Timestamp:

Jul 23, 2019, 11:31:27 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7161acac8387482214ebcdd85e77266519f0cad2

Parents:

d906dc5d406b00b056fb825f5c5c8988ebcaceb3628fc3d0ec524cd36ca82c3a6275c0dcf5d73c83

Message:

Merge branch 'spielwiese' into stable

File:

• libpolys/polys/shiftop.cc (modified) (4 diffs)

libpolys/polys/shiftop.cc

@@ -13 +13 @@
  * -> wait until the new interface is released
 */
-#define SHIFT_MULT_COMPAT_MODE
+/* #define SHIFT_MULT_COMPAT_MODE */
 
 #ifdef SHIFT_MULT_DEBUG
@@ -718 +718 @@
 BOOLEAN _p_LPLmDivisibleByNoComp(poly a, poly b, const ring r)
 {
-  if(p_LmIsConstantComp(a, r))
-    return TRUE;
 #ifdef SHIFT_MULT_COMPAT_MODE
   a = p_Head(a, r);
@@ -726 +724 @@
   p_mLPunshift(b, r);
 #endif
-  int i = (r->N / r->isLPring) - p_LastVblock(a, r);
-  do {
-    int j = r->N - (i * r->isLPring);
+  for (int i = (r->N / r->isLPring) - p_LastVblock(a, r); i >= 0; i--)
+  {
     bool divisible = true;
-    do
+    for (int j = r->N - (i * r->isLPring); j >= 0; j--)
     {
       if (p_GetExp(a, j, r) > p_GetExp(b, j + (i * r->isLPring), r))
@@ -737 +734 @@
         break;
       }
-      j--;
-    }
-    while (j);
+    }
     if (divisible) return TRUE;
-    i--;
-  }
-  while (i > -1);
+  }
 #ifdef SHIFT_MULT_COMPAT_MODE
   p_Delete(&a, r);