Changeset 502859 in git for kernel

Timestamp:

May 4, 2021, 4:35:47 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

45cfb8266d61cc69290d8979c85bf1cdfc5a72df

Parents:

182ac7798e7d403f6c9b311fc8923c0241c720f7

Message:

opt: CanonicalizeP

Location:

kernel/GBEngine

Files:

• kLiftstd.cc (modified) (1 diff)
• kstd1.cc (modified) (2 diffs)
• kstd2.cc (modified) (3 diffs)

kernel/GBEngine/kLiftstd.cc

@@ -147 +147 @@
   if (strat->tl<0) return 1;
   assume(h->FDeg == h->pFDeg());
+  assume(TEST_OPT_IDLIFT);
   poly h_p;
   int i,j,pass,ei, ii, h_d,ci;

kernel/GBEngine/kstd1.cc

@@ -786 +786 @@
 int redFirst (LObject* h,kStrategy strat)
 {
+  if (strat->tl<0) return 1;
   if (h->IsNull()) return 0;
 
@@ -931 +932 @@
           return -1;
         }
+      }
+      if (UNLIKELY(pass>30))
+      {
+        h->CanonicalizeP();
+        pass=0;
+        if (TEST_OPT_PROT) { PrintS("!");mflush(); }
       }
       if ((TEST_OPT_PROT) && (strat->Ll < 0) && (d >= reddeg))

kernel/GBEngine/kstd2.cc

@@ -822 +822 @@
 int redRing (LObject* h,kStrategy strat)
 {
+  if (strat->tl<0) return 1;
   if (h->IsNull()) return 0; // spoly is zero (can only occure with zero divisors)
-  if (strat->tl<0) return 1;
 
   int at/*,i*/;
@@ -1096 +1096 @@
         return -1;
       }
+    }
+    else if (UNLIKELY(pass>30))
+    {
+      h->CanonicalizeP();
+      pass=0;
+      if (TEST_OPT_PROT) { PrintS("!");mflush(); }
     }
   }
@@ -1863 +1869 @@
         reddeg = d;
       }
+    }
+    else if (UNLIKELY(pass>30))
+    {
+      h->CanonicalizeP();
+      pass=0;
+      if (TEST_OPT_PROT) { PrintS("!");mflush(); }
     }
   }