Changeset 76f3202 in git

Timestamp:

Apr 27, 2021, 11:25:28 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

28ae676f7684ca31623ca16ebfdc2f2762f1a8fa

Parents:

5e6cda01eadc1231eeed94bdd2ca804a5d58ad8f

Message:

redHoney, redHomog, redLazy

Location:

kernel/GBEngine

Files:

• kLiftstd.cc (modified) (3 diffs)
• kstd2.cc (modified) (7 diffs)

kernel/GBEngine/kLiftstd.cc

@@ -198 +198 @@
      */
     i = j;
-    if (TEST_OPT_LENGTH)
+    if ((TEST_OPT_LENGTH)&&(li>1))
     loop
     {
@@ -207 +207 @@
       //if (ei < h->ecart)
       //  break;
-      if (li==1)
-        break;
       if ((((strat->T[i].ecart < ei) && (ei> h->ecart))
          || ((strat->T[i].ecart <= h->ecart)
@@ -224 +222 @@
         if (li<=0) li=strat->T[i].GetpLength();
         ii = i;
+        if (li==1) break;
       }
     }

kernel/GBEngine/kstd2.cc

@@ -932 +932 @@
     i = j;
 #if 1
-    if (TEST_OPT_LENGTH)
+    if ((TEST_OPT_LENGTH)&&(li>1))
     loop
     {
@@ -938 +938 @@
       i++;
       if (i > strat->tl)
-        break;
-      if (li==1)
         break;
       if ((strat->T[i].pLength < li)
@@ -952 +950 @@
         if (li<=0) li=strat->T[i].GetpLength();
         ii = i;
+        if (li<3) break;
       }
     }
@@ -1676 +1675 @@
     i = j;
 #if 1
-    if (TEST_OPT_LENGTH)
+    if ((TEST_OPT_LENGTH)&&(li>2))
     loop
     {
@@ -1682 +1681 @@
       i++;
       if (i > strat->tl)
-        break;
-      if (li==1)
         break;
       if ((strat->T[i].pLength < li)
@@ -1696 +1693 @@
         if (li<=0) li=strat->T[i].GetpLength();
         ii = i;
+        if (li<3) break;
       }
     }
@@ -1872 +1870 @@
      */
     i = j;
-    if (TEST_OPT_LENGTH)
+    if ((TEST_OPT_LENGTH)&&(li>1))
     loop
     {
       /*- takes the first possible with respect to ecart -*/
       i++;
-      if (i > strat->tl)
-        break;
-      //if (ei <= h->ecart)
-      //  break;
-      if (li==1)
-        break;
-      strat->T[i].GetpLength();
-      if ((((strat->T[i].ecart < ei) && (ei> h->ecart))
+      if (i > strat->tl) break;
+      if (ei <= h->ecart) break;
+      if(p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i],
+                               h_p, not_sev, strat->tailRing))
+      {
+        strat->T[i].GetpLength();
+        if (((strat->T[i].ecart < ei) && (ei> h->ecart))
          || ((strat->T[i].ecart <= h->ecart) && (strat->T[i].pLength < li)))
-         &&
-          p_LmShortDivisibleBy(strat->T[i].GetLmTailRing(), strat->sevT[i],
-                               h_p, not_sev, strat->tailRing))
-      {
-        /*
-         * the polynomial to reduce with is now;
-         */
-        ei = strat->T[i].ecart;
-        li = strat->T[i].pLength;
-        ii = i;
+        {
+          /*
+          * the polynomial to reduce with is now;
+          */
+          ei = strat->T[i].ecart;
+          li = strat->T[i].pLength;
+          ii = i;
+          if (li==1) break;
+          if (ei<=h->ecart) break;
+        }
       }
     }