Changeset 600ac43 in git
- Timestamp:
- Mar 31, 2000, 3:45:04 PM (24 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 82f0a0f17e4f4e7fae80f34285fc2b04022c3bed
- Parents:
- c7cdc19733f0f1f963726000c989fcd1ff4d548f
- Location:
- Singular
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/kstd1.cc
rc7cdc1 r600ac43 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: kstd1.cc,v 1.4 8 2000-02-02 14:27:46Singular Exp $ */4 /* $Id: kstd1.cc,v 1.49 2000-03-31 13:44:50 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: … … 28 28 29 29 /* the list of all options which give a warning by test */ 30 BITSET kOptions=Sy_bit(0)|Sy_bit(1)|Sy_bit(3)|Sy_bit(4)|Sy_bit(5) 31 |Sy_bit(8)|Sy_bit(10)|Sy_bit(21) 30 BITSET kOptions=Sy_bit(OPT_PROT) /* 0 */ 31 |Sy_bit(OPT_REDSB) /* 1 */ 32 |Sy_bit(OPT_NOT_SUGAR) /* 3 */ 33 |Sy_bit(OPT_INTERRUPT) /* 4 */ 34 |Sy_bit(OPT_SUGARCRIT) /* 5 */ 35 |Sy_bit(OPT_MOREPAIRS) /* 8 */ 36 |Sy_bit(OPT_FASTHC) /* 10 */ 37 |Sy_bit(OPT_KEEPVARS) /* 21 */ 38 |Sy_bit(OPT_INTSTRATEGY) /* 26 */ 39 |Sy_bit(OPT_INFREDTAIL) /* 28 */ 40 |Sy_bit(OPT_NOTREGULARITY) /* 30 */ 41 |Sy_bit(OPT_WEIGHTM); /* 31 */ 42 43 /* the list of all options which may be used by option and test */ 44 BITSET validOpts=Sy_bit(0) 45 |Sy_bit(1) 46 |Sy_bit(2) 47 |Sy_bit(3) 48 |Sy_bit(4) 49 |Sy_bit(5) 50 |Sy_bit(6) 51 |Sy_bit(7) 52 |Sy_bit(8) 53 |Sy_bit(9) 54 |Sy_bit(10) 55 |Sy_bit(11) 56 |Sy_bit(12) 57 |Sy_bit(13) 58 |Sy_bit(14) 59 |Sy_bit(15) 60 |Sy_bit(16) 61 |Sy_bit(17) 62 |Sy_bit(18) 63 |Sy_bit(19) 64 |Sy_bit(20) 65 |Sy_bit(21) 66 |Sy_bit(22) 67 /*|Sy_bit(23)*/ 68 /*|Sy_bit(24)*/ 69 |Sy_bit(OPT_REDTAIL) 32 70 |Sy_bit(OPT_INTSTRATEGY) 33 |Sy_bit(30)|Sy_bit(31); 34 35 /* the list of all options which may be used by option and test */ 36 BITSET validOpts=Sy_bit(0)|Sy_bit(1)|Sy_bit(2)|Sy_bit(3) 37 |Sy_bit(4)|Sy_bit(5)|Sy_bit(6)|Sy_bit(7) 38 |Sy_bit(8)|Sy_bit(9)|Sy_bit(10) 39 |Sy_bit(11)|Sy_bit(12)|Sy_bit(13)|Sy_bit(14)|Sy_bit(15) 40 |Sy_bit(16)|Sy_bit(17)|Sy_bit(18)|Sy_bit(19)|Sy_bit(20) 41 |Sy_bit(21) 42 |Sy_bit(22) 43 /*|Sy_bit(23)*/ 44 /*|Sy_bit(24)*/ 45 |Sy_bit(OPT_REDTAIL) 46 |Sy_bit(OPT_INTSTRATEGY)|Sy_bit(27)|Sy_bit(28) 47 |Sy_bit(29) 48 |Sy_bit(30)|Sy_bit(31); 49 50 //static int (*posInLOld)(LSet L,int Ll, LObject l,kStrategy strat); 51 //static int lastAxis=0; 52 //static BOOLEAN update=TRUE; 71 |Sy_bit(27) 72 |Sy_bit(28) 73 |Sy_bit(29) 74 |Sy_bit(30) 75 |Sy_bit(31); 76 53 77 //static BOOLEAN posInLOldFlag; 54 78 /*FALSE, if posInL == posInL10*/ … … 219 243 i--; 220 244 if (i<0) return 1; 221 } while (!pShortDivisibleBy(strat->S[i], strat->sevS[i], 245 } while (!pShortDivisibleBy(strat->S[i], strat->sevS[i], 222 246 (*h).p, not_sev)); 223 247 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at); … … 378 402 i--; 379 403 if (i<0) return 1; 380 } while (!pShortDivisibleBy(strat->S[i], strat->sevS[i], 404 } while (!pShortDivisibleBy(strat->S[i], strat->sevS[i], 381 405 (*h).p, not_sev)); 382 406 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at); … … 486 510 i--; 487 511 if (i<0) return 1; 488 } while (!pShortDivisibleBy(strat->S[i],strat->sevS[i], 512 } while (!pShortDivisibleBy(strat->S[i],strat->sevS[i], 489 513 (*h).p, not_sev)); 490 514 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at); … … 552 576 || ((strat->T[i].ecart == ei) 553 577 && (strat->T[i].length < li))) 554 && pShortDivisibleBy(strat->T[i].p, strat->T[i].sev, 578 && pShortDivisibleBy(strat->T[i].p, strat->T[i].sev, 555 579 (*h).p, not_sev)) 556 580 { … … 643 667 i--; 644 668 if (i<0) return 1; 645 } while (!pShortDivisibleBy(strat->S[i],strat->sevS[i], 669 } while (!pShortDivisibleBy(strat->S[i],strat->sevS[i], 646 670 (*h).p, not_sev)); 647 671 enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at); … … 979 1003 strat->L[i].p2, 980 1004 strat->kNoether); 981 982 983 strat->L[i].ecart = pLDeg(strat->L[i].p,&strat->L[i].length)-pFDeg(strat->L[i].p); 1005 strat->L[i].ecart = pLDeg(strat->L[i].p,&strat->L[i].length) 1006 -pFDeg(strat->L[i].p); 984 1007 } 985 1008 } … … 1208 1231 if ( strat->kHEdgeFound ) 1209 1232 strat->kNoether = pCopy(ppNoether); 1210 if ( BTEST1(20))1233 if (TEST_OPT_REDBEST) 1211 1234 strat->red = redMoraBest;/*- look for the best in T -*/ 1212 1235 else if (strat->kHEdgeFound || strat->homog) -
Singular/kstd1.h
rc7cdc1 r600ac43 4 4 * Computer Algebra System SINGULAR * 5 5 ****************************************/ 6 /* $Id: kstd1.h,v 1.1 1 1999-11-15 17:20:15 obachmanExp $ */6 /* $Id: kstd1.h,v 1.12 2000-03-31 13:45:04 Singular Exp $ */ 7 7 /* 8 8 * ABSTRACT … … 72 72 26 integer strategy 73 73 27 stop at HC (finiteDeterminacyTest) 74 28 infRedTail: ignore ecart in local redTail-calls 74 75 29 kStd + 1 new element 75 76 30 noRedSyz
Note: See TracChangeset
for help on using the changeset viewer.