- Timestamp:
- Oct 27, 2015, 12:16:10 PM (9 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- d494396ae5d0b97624b211d3996e04e87606f219
- Parents:
- ae72a383dbead65a9abef5325f667319313961e8
- Location:
- kernel/GBEngine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/GBEngine/kstd1.cc
rae72a3 r2d223b 508 508 if (at <= strat->Ll && pLmCmp(h->p, strat->L[strat->Ll].p) != 0 && !nEqual(h->p->coef, strat->L[strat->Ll].p->coef)) 509 509 { 510 #if 1511 510 /*- h will not become the next element to reduce -*/ 512 511 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at); … … 517 516 strat->fromT = FALSE; 518 517 return -1; 519 520 #else521 522 LObject* h2;523 pWrite(h->p);524 h2->tailRing = h->tailRing;525 h2->p = pCopy(h->p);526 pWrite(h2->p);527 strat->initEcart(h2);528 h2->sev = h->sev;529 doRed(h,&(strat->T[ii]),FALSE,strat,FALSE);530 #if ADIDEBUG_NF531 printf("\nPartial reduced (ecart = %i) h: ",h->ecart);pWrite(h->p);532 #endif533 if(h->IsNull())534 {535 if (h->lcm!=NULL)536 {537 pLmDelete(h->lcm);538 }539 h->Clear();540 h2->Clear();541 return 0;542 }543 strat->initEcart(h);544 h->sev = pGetShortExpVector(h->p);545 at = strat->posInL(strat->L,strat->Ll,h,strat);546 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);547 #if ADIDEBUG_NF548 printf("\nThis was reduced and went to L: ");pWrite(h->p);549 #endif550 at = strat->posInL(strat->L,strat->Ll,h2,strat);551 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h2,at);552 #if ADIDEBUG_NF553 printf("\nThis was reduced and went to L: ");pWrite(h2->p);554 #endif555 //This means the pair won't go into T556 return 3;557 #endif558 518 } 559 519 } 560 } 561 // now we finally can reduce 562 doRed(h,&(strat->T[ii]),strat->fromT,strat,FALSE); 520 doRed(h,&(strat->T[ii]),TRUE,strat,TRUE); 521 } 522 else 523 { 524 // now we finally can reduce 525 doRed(h,&(strat->T[ii]),strat->fromT,strat,FALSE); 526 } 563 527 strat->fromT=FALSE; 564 528 // are we done ??? -
kernel/GBEngine/kutil.cc
rae72a3 r2d223b 1515 1515 red_result = strat->red(&h,strat); 1516 1516 if(!h.IsNull()) 1517 enterT(h, strat,-1); 1517 { 1518 //enterT(h, strat,-1); 1519 int pos = posInS(strat,strat->sl,h.p,h.ecart); 1520 strat->enterS(h,pos,strat,-1); 1521 } 1518 1522 } 1519 1523 //#if 1
Note: See TracChangeset
for help on using the changeset viewer.