Changeset dd60cee in git for kernel

Timestamp:

Oct 27, 2015, 4:24:14 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e736f717a4d2e550245f1677b099556f119a6d3c

Parents:

5a4733360224d373ed5606d28971ab428f7d3ffad494396ae5d0b97624b211d3996e04e87606f219

Message:

Merge pull request #729 from adipopescu/StdBugs

Fix: singular trac 747

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (2 diffs)
• kutil.cc (modified) (1 diff)

kernel/GBEngine/kstd1.cc

@@ -509 +509 @@
         if (at <= strat->Ll && pLmCmp(h->p, strat->L[strat->Ll].p) != 0 && !nEqual(h->p->coef, strat->L[strat->Ll].p->coef))
         {
-        #if 1
           /*- h will not become the next element to reduce -*/
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
@@ -518 +517 @@
           strat->fromT = FALSE;
           return -1;
-
-        #else
-
-          LObject* h2;
-          pWrite(h->p);
-          h2->tailRing = h->tailRing;
-          h2->p = pCopy(h->p);
-          pWrite(h2->p);
-          strat->initEcart(h2);
-          h2->sev = h->sev;
-          doRed(h,&(strat->T[ii]),FALSE,strat,FALSE);
-          #if ADIDEBUG_NF
-          printf("\nPartial reduced (ecart = %i) h: ",h->ecart);pWrite(h->p);
-          #endif
-          if(h->IsNull())
-          {
-            if (h->lcm!=NULL)
-            {
-              pLmDelete(h->lcm);
-            }
-            h->Clear();
-            h2->Clear();
-            return 0;
-          }
-          strat->initEcart(h);
-          h->sev = pGetShortExpVector(h->p);
-          at = strat->posInL(strat->L,strat->Ll,h,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
-          #if ADIDEBUG_NF
-          printf("\nThis was reduced and went to L: ");pWrite(h->p);
-          #endif
-          at = strat->posInL(strat->L,strat->Ll,h2,strat);
-          enterL(&strat->L,&strat->Ll,&strat->Lmax,*h2,at);
-          #if ADIDEBUG_NF
-          printf("\nThis was reduced and went to L: ");pWrite(h2->p);
-          #endif
-          //This means the pair won't go into T
-          return 3;
-        #endif
         }
       }
-    }
-    // now we finally can reduce
-    doRed(h,&(strat->T[ii]),strat->fromT,strat,FALSE);
+      doRed(h,&(strat->T[ii]),strat->fromT,strat,TRUE);
+    }
+    else
+    {
+      // now we finally can reduce
+      doRed(h,&(strat->T[ii]),strat->fromT,strat,FALSE);
+    }
     strat->fromT=FALSE;
     // are we done ???

kernel/GBEngine/kutil.cc

@@ -1511 +1511 @@
   {
     if(h.IsNull()) return FALSE;
-    int red_result;
-    if(strat->L != NULL)
-      red_result = strat->red(&h,strat);
+    //int red_result;
+    //reduzieren ist teur!!!
+    //if(strat->L != NULL)
+      //red_result = strat->red(&h,strat);
     if(!h.IsNull())
+    {
       enterT(h, strat,-1);
+      //int pos = posInS(strat,strat->sl,h.p,h.ecart);
+      //strat->enterS(h,pos,strat,-1);
+    }
   }
   //#if 1