Changeset 6c98d52 in git
 Timestamp:
 Jan 11, 2012, 3:13:15 PM (12 years ago)
 Branches:
 (u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
 Children:
 2dbf7e59673f79e50959ef8e51ebc47ff01dcb9651c97ff9c3e771c56591bbd2c4d517a85fd8ab21a88d77fb7c121ed4c21583c156ff79873682c839
 Parents:
 930ea815182bc9bf3182f1c57876006af26295b2
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

kernel/kutil.cc
r930ea8 r6c98d52 1006 1006 void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at) 1007 1007 { 1008 #ifdef PDEBUG1009 /* zaehler++; */1010 #endif /*PDEBUG*/1011 int i;1012 1008 // this should be corrected 1013 1009 assume(p.FDeg == p.pFDeg()); … … 1047 1043 } 1048 1044 1049 void initEcartPairBba (LObject* Lp,poly f,poly g,int ecartF,int ecartG)1045 void initEcartPairBba (LObject* Lp,poly /*f*/,poly /*g*/,int /*ecartF*/,int /*ecartG*/) 1050 1046 { 1051 1047 Lp>FDeg = Lp>pFDeg(); … … 1054 1050 } 1055 1051 1056 void initEcartPairMora (LObject* Lp,poly f,poly g,int ecartF,int ecartG)1052 void initEcartPairMora (LObject* Lp,poly /*f*/,poly /*g*/,int ecartF,int ecartG) 1057 1053 { 1058 1054 Lp>FDeg = Lp>pFDeg(); … … 1295 1291 */ 1296 1292 1297 BOOLEAN enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = 1)1293 BOOLEAN enterOneStrongPoly (int i,poly p,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR = 1) 1298 1294 { 1299 1295 number d, s, t; … … 2350 2346 *using the chaincriterion in B and L and enters B to L 2351 2347 */ 2352 void chainCritRing (poly p,int ecart,kStrategy strat)2348 void chainCritRing (poly p,int, kStrategy strat) 2353 2349 { 2354 2350 int i,j,l; … … 2918 2914 void initenterstrongPairs (poly h,int k,int ecart,int isFromQ,kStrategy strat, int atR = 1) 2919 2915 { 2920 const intiCompH = pGetComp(h);2916 const unsigned long iCompH = pGetComp(h); 2921 2917 if (!nIsOne(pGetCoeff(h))) 2922 2918 { … … 3228 3224 int en = length; 3229 3225 int cmp_int = currRing>OrdSgn; 3230 int pc=pGetComp(p);3231 3226 if ((currRing>MixedOrder) 3232 3227 #ifdef HAVE_PLURAL … … 3325 3320 * the position is the last one 3326 3321 */ 3327 int posInT0 (const TSet set,const int length,LObject &p)3322 int posInT0 (const TSet,const int length,LObject &) 3328 3323 { 3329 3324 return (length+1); … … 3770 3765 /* cc==1 for (c,..), cc==1 for (C,..) */ 3771 3766 int o = p.GetpFDeg() + p.ecart; 3772 intc = pGetComp(p.p)*cc;3767 unsigned long c = pGetComp(p.p)*cc; 3773 3768 3774 3769 if (pGetComp(set[length].p)*cc < c) … … 3886 3881 */ 3887 3882 int posInLSpecial (const LSet set, const int length, 3888 LObject *p,const kStrategy strat)3883 LObject *p,const kStrategy) 3889 3884 { 3890 3885 if (length<0) return 0; … … 3929 3924 */ 3930 3925 int posInL0 (const LSet set, const int length, 3931 LObject* p,const kStrategy strat)3926 LObject* p,const kStrategy) 3932 3927 { 3933 3928 if (length<0) return 0; … … 3960 3955 */ 3961 3956 int posInL11 (const LSet set, const int length, 3962 LObject* p,const kStrategy strat)3957 LObject* p,const kStrategy) 3963 3958 /*{ 3964 3959 * int j=0; … … 4030 4025 4031 4026 int posInLrg0 (const LSet set, const int length, 4032 LObject* p,const kStrategy strat)4027 LObject* p,const kStrategy) 4033 4028 /* if (nGreater(pGetCoeff(p), pGetCoeff(set[an]))) return en; 4034 4029 if (pLmCmp(set[i],p) == cmp_int) en = i; … … 4114 4109 */ 4115 4110 int posInL110 (const LSet set, const int length, 4116 LObject* p,const kStrategy strat)4111 LObject* p,const kStrategy) 4117 4112 { 4118 4113 if (length<0) return 0; … … 4160 4155 */ 4161 4156 int posInL13 (const LSet set, const int length, 4162 LObject* p,const kStrategy strat)4157 LObject* p,const kStrategy) 4163 4158 { 4164 4159 if (length<0) return 0; … … 4195 4190 */ 4196 4191 int posInL15 (const LSet set, const int length, 4197 LObject* p,const kStrategy strat)4192 LObject* p,const kStrategy) 4198 4193 /*{ 4199 4194 * int j=0; … … 4253 4248 */ 4254 4249 int posInL17 (const LSet set, const int length, 4255 LObject* p,const kStrategy strat)4250 LObject* p,const kStrategy) 4256 4251 { 4257 4252 if (length<0) return 0; … … 4301 4296 */ 4302 4297 int posInL17_c (const LSet set, const int length, 4303 LObject* p,const kStrategy strat)4298 LObject* p,const kStrategy) 4304 4299 { 4305 4300 if (length<0) return 0; … … 4307 4302 int cc = (1+2*currRing>order[0]==ringorder_c); 4308 4303 /* cc==1 for (c,..), cc==1 for (C,..) */ 4309 intc = pGetComp(p>p)*cc;4304 unsigned long c = pGetComp(p>p)*cc; 4310 4305 int o = p>GetpFDeg() + p>ecart; 4311 4306 … … 4442 4437 { 4443 4438 poly h, hn; 4444 int j;4445 unsigned long not_sev;4446 4439 strat>redTailChange=FALSE; 4447 4440 … … 4562 4555 { 4563 4556 cnt=REDTAIL_CANONICALIZE; 4564 poly tmp=Ln.CanonicalizeP();4557 /*poly tmp=*/Ln.CanonicalizeP(); 4565 4558 if (normalize) 4566 4559 { … … 4650 4643 { 4651 4644 cnt=REDTAIL_CANONICALIZE; 4652 poly tmp=Ln.CanonicalizeP();4653 } 4654 // we are in Z, do not Ccall pNorm4645 /*poly tmp=*/Ln.CanonicalizeP(); 4646 } 4647 // we are in Z, do not call pNorm 4655 4648 strat>redTailChange=TRUE; 4656 4649 // test divisibility of coefs: … … 5573 5566 void enterSBba (LObject p,int atS,kStrategy strat, int atR) 5574 5567 { 5575 int i;5576 5568 strat>news = TRUE; 5577 5569 /* puts p to the standardbasis s at position at */ 
libpolys/polys/monomials/p_polys.h
r930ea8 r6c98d52 55 55 } 56 56 57 //#define p_GetCoeff(p,r) pGetCoeff(p)58 static inline number& p_GetCoeff(poly p, const ring r)59 {60 assume(r != NULL);61 return pGetCoeff(p);62 }57 #define p_GetCoeff(p,r) pGetCoeff(p) 58 //static inline number& p_GetCoeff(poly p, const ring r) 59 //{ 60 // assume(r != NULL); 61 // return pGetCoeff(p); 62 //} 63 63 64 64
Note: See TracChangeset
for help on using the changeset viewer.