Changeset fee33e in git for kernel/kstd2.cc
- Timestamp:
- Jul 2, 2012, 7:50:07 AM (12 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 0758b5a070556dd402b297144aae88721940fd10
- Parents:
- 1bc7d4ac8a4fd3280459ab78ca65bd4e60dd2c93
- git-author:
- Christian Eder <ederc@mathematik.uni-kl.de>2012-07-02 07:50:07+02:00
- git-committer:
- Christian Eder <ederc@mathematik.uni-kl.de>2012-07-05 16:12:50+02:00
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/kstd2.cc
r1bc7d4a rfee33e 57 57 #include <kernel/khstd.h> 58 58 #include <polys/kbuckets.h> 59 #include <polys/prCopy.h> 59 60 //#include "cntrlc.h" 60 61 #include <polys/weight.h> … … 1497 1498 { 1498 1499 rChangeCurrRing (sRing); 1499 F = idrMoveR (F0, currRingOld );1500 F = idrMoveR (F0, currRingOld, currRing); 1500 1501 } 1501 1502 } … … 1513 1514 int olddeg,reduc; 1514 1515 int hilbeledeg=1,hilbcount=0,minimcnt=0; 1516 long zeroreductions = 0; 1515 1517 LObject L; 1516 1518 BOOLEAN withT = FALSE; … … 1555 1557 1556 1558 #ifdef HAVE_TAIL_RING 1557 if(!idIs0(F) &&(!rField_is_Ring( ))) // create strong gcd poly computes with tailring and S[i] ->to be fixed1559 if(!idIs0(F) &&(!rField_is_Ring(currRing))) // create strong gcd poly computes with tailring and S[i] ->to be fixed 1558 1560 kStratInitChangeTailRing(strat); 1559 1561 #endif … … 1580 1582 if (strat->Ll== 0) strat->interpt=TRUE; 1581 1583 if (TEST_OPT_DEGBOUND 1582 && ((strat->honey && (strat->L[strat->Ll].ecart+ pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))1583 || ((!strat->honey) && ( pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))1584 && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)) 1585 || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))) 1584 1586 { 1585 1587 /* … … 1590 1592 while ((strat->Ll >= 0) 1591 1593 && (strat->L[strat->Ll].p1!=NULL) && (strat->L[strat->Ll].p2!=NULL) 1592 && ((strat->honey && (strat->L[strat->Ll].ecart+ pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))1593 || ((!strat->honey) && ( pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)))1594 && ((strat->honey && (strat->L[strat->Ll].ecart+currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg)) 1595 || ((!strat->honey) && (currRing->pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))) 1594 1596 ) 1595 1597 deleteInL(strat->L,&strat->Ll,strat->Ll,strat); … … 1972 1974 1973 1975 exitSba(strat); 1974 if (TEST_OPT_WEIGHTM)1975 {1976 pRestoreDegProcs(pFDegOld, pLDegOld);1977 if (ecartWeights)1978 {1979 omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short));1980 ecartWeights=NULL;1981 }1982 }1983 if (TEST_OPT_PROT) messageStat( srmax,lrmax,hilbcount,strat);1976 // if (TEST_OPT_WEIGHTM) 1977 // { 1978 // pRestoreDegProcs(pFDegOld, pLDegOld); 1979 // if (ecartWeights) 1980 // { 1981 // omFreeSize((ADDRESS)ecartWeights,(pVariables+1)*sizeof(short)); 1982 // ecartWeights=NULL; 1983 // } 1984 // } 1985 if (TEST_OPT_PROT) messageStat(hilbcount,strat); 1984 1986 if (Q!=NULL) updateResult(strat->Shdl,Q,strat); 1985 1987 … … 2002 2004 { 2003 2005 rChangeCurrRing (currRingOld); 2004 F0 = idrMoveR (F, sRing );2005 strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing );2006 F0 = idrMoveR (F, sRing, currRing); 2007 strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing, currRing); 2006 2008 rDelete (sRing); 2007 2009 } … … 2208 2210 if (h.p!=NULL) 2209 2211 { 2210 if ( pOrdSgn==-1)2212 if (currRing->OrdSgn==-1) 2211 2213 { 2212 2214 cancelunit(&h);
Note: See TracChangeset
for help on using the changeset viewer.