Changeset 457d8d6 in git for Singular/kutil.cc
- Timestamp:
- Mar 8, 2001, 2:05:15 PM (23 years ago)
- Branches:
- (u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
- Children:
- 5a8b9c4598a09a1500a99df3038cb27e10a0215f
- Parents:
- 65b27c5c9be783dc3dacb25081a2b1227c9d5425
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/kutil.cc
r65b27c r457d8d6 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: kutil.cc,v 1.9 7 2001-02-21 15:41:47Singular Exp $ */4 /* $Id: kutil.cc,v 1.98 2001-03-08 13:05:13 Singular Exp $ */ 5 5 /* 6 6 * ABSTRACT: kernel: utils for kStd … … 1597 1597 for (i=1; i<=strat->sl; i++) 1598 1598 { 1599 at = posInS(strat,i-1,strat->S[i] );1599 at = posInS(strat,i-1,strat->S[i],strat->ecartS[i]); 1600 1600 if (at != i) 1601 1601 { … … 1637 1637 * otherwise, bba has to be changed 1638 1638 */ 1639 int posInS (kStrategy strat, int length,poly p )1639 int posInS (kStrategy strat, int length,poly p, int ecart_p) 1640 1640 { 1641 1641 if(length==-1) return 0; … … 1677 1677 loop 1678 1678 { 1679 int dummy;1680 1679 if (an >= en-1) 1681 1680 { … … 1683 1682 if (pLmCmp(set[an],p) == -cmp_int) return en; 1684 1683 if ((cmp_int!=1) 1685 && (( pFDeg(set[an])+strat->ecartS[an])<pLDeg(p,&dummy)))1684 && ((strat->ecartS[an])<ecart_p)) 1686 1685 return an; 1687 1686 return en; … … 1693 1692 { 1694 1693 if ((cmp_int!=1) 1695 &&(( pFDeg(set[i])+strat->ecartS[i])<pLDeg(p,&dummy)))1694 &&((strat->ecartS[i])<ecart_p)) 1696 1695 en=i; 1697 1696 else … … 2942 2941 else 2943 2942 { 2944 pos = posInS(strat,strat->sl,h.p );2943 pos = posInS(strat,strat->sl,h.p,h.ecart); 2945 2944 } 2946 2945 h.sev = pGetShortExpVector(h.p); … … 2983 2982 else 2984 2983 { 2985 pos = posInS(strat,strat->sl,h.p );2984 pos = posInS(strat,strat->sl,h.p,h.ecart); 2986 2985 } 2987 2986 h.sev = pGetShortExpVector(h.p); … … 3041 3040 else 3042 3041 { 3043 pos = posInS(strat,strat->sl,h.p );3042 pos = posInS(strat,strat->sl,h.p,h.ecart); 3044 3043 } 3045 3044 h.sev = pGetShortExpVector(h.p); … … 3145 3144 else 3146 3145 { 3147 pos = posInS(strat,strat->sl,h.p );3146 pos = posInS(strat,strat->sl,h.p,h.ecart); 3148 3147 } 3149 3148 h.sev = pGetShortExpVector(h.p); … … 3183 3182 else 3184 3183 { 3185 pos = posInS(strat,strat->sl,h.p );3184 pos = posInS(strat,strat->sl,h.p,h.ecart); 3186 3185 } 3187 3186 h.sev = pGetShortExpVector(h.p); … … 3235 3234 h.sev = pGetShortExpVector(h.p); 3236 3235 h.SetpFDeg(); 3237 pos = posInS(strat,strat->sl,h.p );3236 pos = posInS(strat,strat->sl,h.p,h.ecart); 3238 3237 enterpairsSpecial(h.p,strat->sl,h.ecart,pos,strat,strat->tl+1); 3239 3238 strat->enterS(h,pos,strat, strat->tl+1);
Note: See TracChangeset
for help on using the changeset viewer.