Changeset 6a1cdff in git for kernel/GBEngine

Timestamp:

Nov 16, 2022, 5:20:01 PM (18 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

3c6f0ffaf164cb9431bba2f23a727bae0ba8ce1b

Parents:

47c5e69b0818e4915a26317e74b0ffe5b1b81ef8

Message:

simplify red for Z

File:

• kernel/GBEngine/kstd2.cc (modified) (7 diffs)

kernel/GBEngine/kstd2.cc

@@ -160 +160 @@
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
         if (p_LmShortDivisibleBy(T0p, sevT0, p, not_sev, r))
+#else
+        if (!(sevT0 & not_sev) && p_LmDivisibleBy(T0p, p, r))
+#endif
         {
           if (n_QuotRem!=ndQuotRem) /*euclidean ring*/
@@ -174 +177 @@
           }
         }
+    }
+    else
+    {
+        const poly T0p  = strat->T[0].t_p;
+        const ring r    = strat->tailRing;
+        const poly p    = L->t_p;
+        orest           = pGetCoeff(p);
+#if defined(PDEBUG) || defined(PDIV_DEBUG)
+        if (p_LmShortDivisibleBy(T0p, sevT0,
+                    p, not_sev, r))
 #else
         if (!(sevT0 & not_sev) && p_LmDivisibleBy(T0p, p, r))
+#endif
         {
           if (n_QuotRem!=ndQuotRem) /*euclidean ring*/
@@ -190 +204 @@
           }
         }
-#endif
-    }
-    else
-    {
-        const poly T0p  = strat->T[0].t_p;
-        const ring r    = strat->tailRing;
-        const poly p    = L->t_p;
-        orest           = pGetCoeff(p);
-#if defined(PDEBUG) || defined(PDIV_DEBUG)
-        if (p_LmShortDivisibleBy(T0p, sevT0,
-                    p, not_sev, r))
-        {
-          if (n_QuotRem!=ndQuotRem) /*euclidean ring*/
-          {
-            mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
-            {
-              n_Delete(&mult,r->cf);
-              n_Delete(&rest,r->cf);
-              return 0;
-            }
-            n_Delete(&mult,r->cf);
-            n_Delete(&rest,r->cf);
-          }
-        }
-#else
-        if (!(sevT0 & not_sev) && p_LmDivisibleBy(T0p, p, r))
-        {
-          if (n_QuotRem!=ndQuotRem) /*euclidean ring*/
-          {
-            mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T0p), &rest, r->cf);
-            if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
-            {
-              n_Delete(&mult,r->cf);
-              n_Delete(&rest,r->cf);
-              return 0;
-            }
-            n_Delete(&mult,r->cf);
-            n_Delete(&rest,r->cf);
-          }
-        }
-#endif
     }
     return -1;
@@ -258 +230 @@
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
       if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
+#else
+      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].p, p, r))
+#endif
       {
         mult= n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
@@ -266 +241 @@
         }
       }
-#else
-      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].p, p, r))
-      {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].p), &rest, r->cf);
-        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
-        {
-          o = j;
-          orest = rest;
-        }
-      }
-#endif
       j++;
     }
@@ -291 +255 @@
       if (p_LmShortDivisibleBy(T[j].t_p, sevT[j],
             p, not_sev, r))
+#else
+      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].t_p, p, r))
+#endif
       {
         mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].t_p), &rest, r->cf);
@@ -299 +266 @@
         }
       }
-#else
-      if (!(sevT[j] & not_sev) && p_LmDivisibleBy(T[j].t_p, p, r))
-      {
-        mult = n_QuotRem(pGetCoeff(p), pGetCoeff(T[j].t_p), &rest, r->cf);
-        if (!n_IsZero(mult, r->cf) && n_Greater(n_EucNorm(orest, r->cf), n_EucNorm(rest, r->cf), r->cf))
-        {
-          o = j;
-          orest = rest;
-        }
-      }
-#endif
       j++;
     }