Changeset d95cee in git for kernel

Timestamp:

Jul 17, 2009, 11:51:42 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

3c7278bb58cb6b216292adf91871509a8d8455da

Parents:

9446f84181f539db0f2689bb27e177084073a62f

Message:

*hannes: kInterRedBba/solve


git-svn-id: file:///usr/local/Singular/svn/trunk@11986 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

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

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.53 2009-07-10 15:13:56 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.54 2009-07-17 09:51:42 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -323 +323 @@
       if (h->pTotalDeg()+h->ecart >= strat->tailRing->bitmask)
       {
-        strat->overflow=TRUE;
+        strat->overflow=TRUE;
         //Print("OVERFLOW in redEcart d=%ld, max=%ld",d,strat->tailRing->bitmask);
-        h->GetP();
-        at = strat->posInL(strat->L,strat->Ll,h,strat);
-        enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-        h->Clear();
+        h->GetP();
+        at = strat->posInL(strat->L,strat->Ll,h,strat);
+        enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
+        h->Clear();
         return -1;
       }
@@ -454 +454 @@
         if (h->pTotalDeg()+h->ecart >= strat->tailRing->bitmask)
         {
-          strat->overflow=TRUE;
+          strat->overflow=TRUE;
           //Print("OVERFLOW in redFirst d=%ld, max=%ld",d,strat->tailRing->bitmask);
-          h->GetP();
-          at = strat->posInL(strat->L,strat->Ll,h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-          h->Clear();
+          h->GetP();
+          at = strat->posInL(strat->L,strat->Ll,h,strat);
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
+          h->Clear();
           return -1;
         }
@@ -1665 +1665 @@
   if (i<=kModW->length())
     return o+(*kModW)[i-1];
-  return o;  
+  return o;
 }
 long kHomModDeg(poly p, ring r)
@@ -2273 +2273 @@
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
     #ifdef KDEBUG
-      #ifdef HAVE_RINGS
-        if (TEST_OPT_DEBUG) PrintS("--- next step ---\n");
-      #endif
       if (TEST_OPT_DEBUG) messageSets(strat);
     #endif
@@ -2354 +2351 @@
       if (strat->sl>srmax) srmax = strat->sl;
       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);
+        }
+        strat->sl=pos;
+      }
     }
 
@@ -2360 +2391 @@
     memset(&(strat->P), 0, sizeof(strat->P));
 #endif
-    kTest_TS(strat);
+    //kTest_TS(strat);: i_r out of sync in kInterRedBba, but not used!
   }
 #ifdef KDEBUG
@@ -2413 +2444 @@
     return kInterRedOld(F,Q);
 
+    //return kInterRedOld(F,Q);
+
   BITSET save=test;
   //test|=Sy_bit(OPT_NOT_SUGAR);

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.97 2009-07-13 16:36:35 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.98 2009-07-17 09:51:42 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1000 +1000 @@
     #ifdef KDEBUG
       loop_count++;
-      #ifdef HAVE_RINGS
-        if (TEST_OPT_DEBUG) PrintS("--- next step ---\n");
-      #endif
       if (TEST_OPT_DEBUG) messageSets(strat);
     #endif