Changeset a973339 in git

Timestamp:

Dec 12, 2013, 1:55:10 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

53beb57b7f12a428116cb0a7b7bf24460400c5fb

Parents:

f1babfbabc0fc2906b36df32051eaaf09673dc6f

Message:

chg: option IDLIFT to speed up liftstd (2 args)

Location:

kernel

Files:

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

kernel/kstd1.cc

@@ -2969 +2969 @@
 
       // enter into S, L, and T
-      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      {
         enterT(strat->P, strat);
-      // posInS only depends on the leading term
-      strat->enterS(strat->P, pos, strat, strat->tl);
-
+        // posInS only depends on the leading term
+        strat->enterS(strat->P, pos, strat, strat->tl);
+
+        if (pos<strat->sl)
+        {
+          need_retry++;
+          // move all "larger" elements fromS to L
+          // remove them from T
+          int ii=pos+1;
+          for(;ii<=strat->sl;ii++)
+          {
+            LObject h;
+            memset(&h,0,sizeof(h));
+            h.tailRing=strat->tailRing;
+            h.p=strat->S[ii]; strat->S[ii]=NULL;
+            strat->initEcart(&h);
+            h.sev=strat->sevS[ii];
+            int jj=strat->tl;
+            while (jj>=0)
+            {
+              if (strat->T[jj].p==h.p)
+              {
+                strat->T[jj].p=NULL;
+                if (jj<strat->tl)
+                {
+                  memmove(&(strat->T[jj]),&(strat->T[jj+1]),
+                          (strat->tl-jj)*sizeof(strat->T[jj]));
+                  memmove(&(strat->sevT[jj]),&(strat->sevT[jj+1]),
+                          (strat->tl-jj)*sizeof(strat->sevT[jj]));
+                }
+                strat->tl--;
+                break;
+              }
+              jj--;
+            }
+            int lpos=strat->posInL(strat->L,strat->Ll,&h,strat);
+            enterL(&strat->L,&strat->Ll,&strat->Lmax,h,lpos);
+            #ifdef KDEBUG
+            if (TEST_OPT_DEBUG)
+            {
+              Print("move S[%d] -> L[%d]: ",ii,pos);
+              p_wrp(h.p,currRing, strat->tailRing);
+              PrintLn();
+            }
+            #endif
+          }
+          if (strat->fromQ!=NULL)
+          {
+            for(ii=pos+1;ii<=strat->sl;ii++) strat->fromQ[ii]=0;
+          }
+          strat->sl=pos;
+        }
+      }
+      else
+      {
+        // clean P
+      }
       if (strat->P.lcm!=NULL)
 #ifdef HAVE_RINGS
@@ -2980 +3035 @@
         pLmFree(strat->P.lcm);
 #endif
-      if (pos<strat->sl)
-      {
-        need_retry++;
-        // move all "larger" elements fromS to L
-        // remove them from T
-        int ii=pos+1;
-        for(;ii<=strat->sl;ii++)
-        {
-          LObject h;
-          memset(&h,0,sizeof(h));
-          h.tailRing=strat->tailRing;
-          h.p=strat->S[ii]; strat->S[ii]=NULL;
-          strat->initEcart(&h);
-          h.sev=strat->sevS[ii];
-          int jj=strat->tl;
-          while (jj>=0)
-          {
-            if (strat->T[jj].p==h.p)
-            {
-              strat->T[jj].p=NULL;
-              if (jj<strat->tl)
-              {
-                memmove(&(strat->T[jj]),&(strat->T[jj+1]),
-                        (strat->tl-jj)*sizeof(strat->T[jj]));
-                memmove(&(strat->sevT[jj]),&(strat->sevT[jj+1]),
-                        (strat->tl-jj)*sizeof(strat->sevT[jj]));
-              }
-              strat->tl--;
-              break;
-            }
-            jj--;
-          }
-          int lpos=strat->posInL(strat->L,strat->Ll,&h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,h,lpos);
-          #ifdef KDEBUG
-          if (TEST_OPT_DEBUG)
-          {
-            Print("move S[%d] -> L[%d]: ",ii,pos);
-            p_wrp(h.p,currRing, strat->tailRing);
-            PrintLn();
-          }
-          #endif
-        }
-        if (strat->fromQ!=NULL)
-        {
-          for(ii=pos+1;ii<=strat->sl;ii++) strat->fromQ[ii]=0;
-        }
-        strat->sl=pos;
-      }
     }
 

kernel/kstd2.cc

@@ -1390 +1390 @@
 
       // enter into S, L, and T
-      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      {
         enterT(strat->P, strat);
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing))
-        superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
-      else
-#endif
-        enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
-      // posInS only depends on the leading term
-      strat->enterS(strat->P, pos, strat, strat->tl);
+        if (rField_is_Ring(currRing))
+          superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+        else
+#endif
+          enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+        // posInS only depends on the leading term
+        strat->enterS(strat->P, pos, strat, strat->tl);
 #if 0
-      int pl=pLength(strat->P.p);
-      if (pl==1)
-      {
-        //if (TEST_OPT_PROT)
-        //PrintS("<1>");
-      }
-      else if (pl==2)
-      {
-        //if (TEST_OPT_PROT)
-        //PrintS("<2>");
-      }
-#endif
+        int pl=pLength(strat->P.p);
+        if (pl==1)
+        {
+          //if (TEST_OPT_PROT)
+          //PrintS("<1>");
+        }
+        else if (pl==2)
+        {
+          //if (TEST_OPT_PROT)
+          //PrintS("<2>");
+        }
+#endif
+      }
       if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
 //      Print("[%d]",hilbeledeg);
@@ -2449 +2451 @@
       // enter into S, L, and T
       // here we need to recompute new signatures, but those are trivial ones
-      //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
-      enterT(strat->P, strat);
-      // posInS only depends on the leading term
-      strat->enterS(strat->P, pos, strat, strat->tl);
+      if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
+      {
+        enterT(strat->P, strat);
+        // posInS only depends on the leading term
+        strat->enterS(strat->P, pos, strat, strat->tl);
 //#if 1
 #ifdef DEBUGF5
-      Print("ELEMENT ADDED TO GCURR DURING INTERRED: ");
-      pWrite(pHead(strat->S[strat->sl]));
-      pWrite(strat->sig[strat->sl]);
-#endif
-      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+        Print("ELEMENT ADDED TO GCURR DURING INTERRED: ");
+        pWrite(pHead(strat->S[strat->sl]));
+        pWrite(strat->sig[strat->sl]);
+#endif
+        if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+      }
       //      Print("[%d]",hilbeledeg);
       if (strat->P.lcm!=NULL)