Changeset 9a14a5 in git

Timestamp:

Feb 8, 2018, 4:00:31 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c062cc8497e2f23c850dfc0661158f69fdf3e88a

Parents:

a8df82e84ee87330065595cb27cd3591e07a76e7

Message:

fix: siCntrlc handling in std

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (2 diffs)
• kstd2.cc (modified) (2 diffs)

kernel/GBEngine/kstd1.cc

@@ -1583 +1583 @@
     if (TEST_OPT_DEBUG) messageSets(strat);
     #endif
-    if (siCntrlc
-    || (TEST_OPT_DEGBOUND
-      && (strat->L[strat->Ll].ecart+strat->L[strat->Ll].GetpFDeg()> Kstd1_deg)))
+    if (siCntrlc)
+    {
+      while (strat->Ll >= 0)
+        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
+      strat->noClearS=TRUE;
+    }
+    if (TEST_OPT_DEGBOUND
+    && (strat->L[strat->Ll].ecart+strat->L[strat->Ll].GetpFDeg()> Kstd1_deg))
     {
       /*
@@ -1591 +1596 @@
       * - 24 (degBound)
       *   && upper degree is bigger than Kstd1_deg
-      * or siCntrlc
       */
-      while ((strat->Ll >= 0) &&
-        siCntrlc
-        || ((strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
-          && (strat->L[strat->Ll].ecart+strat->L[strat->Ll].GetpFDeg()> Kstd1_deg))
+      while ((strat->Ll >= 0)
+        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
+        && (strat->L[strat->Ll].ecart+strat->L[strat->Ll].GetpFDeg()> Kstd1_deg)
       )
       {

kernel/GBEngine/kstd2.cc

@@ -1962 +1962 @@
       if (TEST_OPT_DEBUG) messageSets(strat);
     #endif
-    if (strat->Ll== 0) strat->interpt=TRUE;
-    if (siCntrlc
-    || (TEST_OPT_DEGBOUND
+    if (siCntrlc)
+    {
+      while (strat->Ll >= 0)
+        deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
+      strat->noClearS=TRUE;
+    }
+    if (TEST_OPT_DEGBOUND
         && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
-            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))))
+            || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     {
       /*
@@ -1972 +1976 @@
        * 24 IN test and the degree +ecart of L[strat->Ll] is bigger then
        *a predefined number Kstd1_deg
-       * or siCntrlc
        */
       while ((strat->Ll >= 0)
-        && (siCntrlc ||
-          ((strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
-            && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+        && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL)
+        && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
             || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))
-        )))
+        )
         deleteInL(strat->L,&strat->Ll,strat->Ll,strat);
       if (strat->Ll<0) break;
       else strat->noClearS=TRUE;
     }
+    if (strat->Ll== 0) strat->interpt=TRUE;
     /* picks the last element from the lazyset L */
     strat->P = strat->L[strat->Ll];