Changeset f0b6c9 in git
- Timestamp:
- Dec 18, 2006, 9:55:03 AM (17 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 50daa2edb86901bcac372e37915d199fdc6f9a15
- Parents:
- bbeef1b321e41ca47ee3ff8c3362cc27558d1a01
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/kstd2.cc
rbbeef1 rf0b6c9 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: kstd2.cc,v 1. 29 2006-12-15 17:16:07Singular Exp $ */4 /* $Id: kstd2.cc,v 1.30 2006-12-18 08:55:03 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT - Kernel: alg. of Buchberger … … 580 580 581 581 li = strat->T[j].pLength; 582 #if 0 583 if (li==0) 584 { 585 li=strat->T[j].pLength=pLength(strat->T[j].p); 586 } 587 #endif 582 588 ii = j; 583 589 /* … … 596 602 if (li<=1) 597 603 break; 604 #if 0 605 if (strat->T[i].pLength==0) 606 { 607 PrintS("!"); 608 strat->T[i].pLength=pLength(strat->T[i].p); 609 } 610 #endif 598 611 if ((strat->T[i].pLength < li) 599 612 && … … 604 617 * the polynomial to reduce with is now; 605 618 */ 619 PrintS("+"); 606 620 li = strat->T[i].pLength; 607 621 ii = i; … … 651 665 /*- try to reduce the s-polynomial -*/ 652 666 pass++; 653 if ( !K_TEST_OPT_REDTHROUGH &&667 if (//!K_TEST_OPT_REDTHROUGH && 654 668 (strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass))) 655 669 { … … 707 721 ei = strat->T[j].ecart; 708 722 li = strat->T[j].pLength; 723 #if 0 724 if (li==0) 725 { 726 PrintS("!"); 727 li=strat->T[j].pLength=pLength(strat->T[j].p); 728 } 729 #endif 709 730 ii = j; 710 731 /* … … 719 740 if (i > strat->tl) 720 741 break; 721 if (ei < h->ecart)722 break;742 //if (ei < h->ecart) 743 // break; 723 744 if (li<=1) 724 745 break; 725 if ((( strat->T[i].ecart < ei)746 if ((((strat->T[i].ecart < ei) && (ei> h->ecart)) 726 747 || ((strat->T[i].ecart <= h->ecart) && (strat->T[i].pLength < li))) 727 748 && … … 1185 1206 1186 1207 // enter into S, L, and T 1187 enterT(strat->P, strat); 1208 if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp)) 1209 enterT(strat->P, strat); 1188 1210 #ifdef HAVE_RING2TOM 1189 1211 #ifdef HAVE_VANGB … … 1196 1218 enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl); 1197 1219 // posInS only depends on the leading term 1220 if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp)) 1221 { 1198 1222 #ifdef HAVE_VANGB 1199 1223 strat->enterS(strat->P, pos, strat, at_R); … … 1201 1225 strat->enterS(strat->P, pos, strat, strat->tl); 1202 1226 #endif 1227 } 1228 else 1229 { 1230 strat->P.Delete(); 1231 } 1232 #if 0 1203 1233 int pl=pLength(strat->P.p); 1204 1234 if (pl==1) … … 1212 1242 //PrintS("<2>"); 1213 1243 } 1244 #endif 1214 1245 if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat); 1215 1246 // Print("[%d]",hilbeledeg);
Note: See TracChangeset
for help on using the changeset viewer.