Changeset f5d2963 in git
 Timestamp:
 Oct 28, 2009, 3:52:40 PM (15 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c1c65551e4b3a0de0b13ddf30446f6e9569681b5')
 Children:
 7d60f7ef29be846d8ebb02dd71d5c04294bc7831
 Parents:
 c48e808503cec7132527760979f9671dda451da8
 Location:
 factory
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

factory/NTLconvert.cc
rc48e80 rf5d2963 1 /* $Id: NTLconvert.cc,v 1.2 6 20090604 17:50:49Singular Exp $ */1 /* $Id: NTLconvert.cc,v 1.27 20091028 14:51:26 Singular Exp $ */ 2 2 #include <config.h> 3 3 … … 1102 1102 return result; 1103 1103 } 1104 1105 CanonicalForm convertNTLzz_pEX2CF (zz_pEX f, Variable x, Variable alpha) 1106 { 1107 CanonicalForm bigone= 0; 1108 for (int j=0;j<deg(f)+1;j++) 1109 { 1110 if (IsOne(coeff(f,j))) 1111 bigone+=power(x,j); 1112 else 1113 { 1114 //cout << "hier doof" << "\n"; 1115 CanonicalForm coefficient=convertNTLzzpE2CF(coeff(f,j),alpha); 1116 //cout << "ja" << "\n"; 1117 if (coeff(f,j)!=0) 1118 bigone += (power(x,j)*coefficient); 1119 } 1120 } 1121 } 1104 1122 #endif 
factory/cf_gcd_charp.cc
rc48e80 rf5d2963 176 176 CanonicalForm interPoly; 177 177 178 interPoly = oldInterPoly + (u  oldInterPoly(alpha, x)) / newtonPoly(alpha, x) * newtonPoly; 179 178 interPoly = oldInterPoly + ((u  oldInterPoly(alpha, x)) / newtonPoly(alpha, x)) * newtonPoly; 179 /*cout << "newtonPoly (alpha,x)= " << newtonPoly (alpha,x) << "\n"; 180 cout << "1/newtonPoly (alpha,x)= " << 1/newtonPoly (alpha,x) << "\n"; 181 cout << "newtonPoly (alpha,x)*(1/newtonPoly (alpha,x))= " << newtonPoly (alpha,x)*(1/newtonPoly (alpha,x)) << "\n";*/ 180 182 //if(debug)cout << "newtonInterpIncremental output:" << interPoly << endl; 181 183 return interPoly; … … 219 221 } 220 222 //if(debug == 1)cout << "simpleGCD output: " << P1 << endl; 221 return(P1 );223 return(P1/lc(P1)); 222 224 } 223 225 … … 230 232 CanonicalForm result = 0; 231 233 int i, j; 232 int fieldSize = (int) pow(getCharacteristic(), getGFDegree());234 int fieldSize = (int) ::pow(getCharacteristic(), getGFDegree()); 233 235 CanonicalForm g; 234 236 for(i = 0; i <= degree(A); i++) … … 351 353 { 352 354 k=getGFDegree(); 353 fieldSize = (int) pow(p, k);355 fieldSize = (int) ::pow(p, k); 354 356 } 355 357 … … 508 510 } 509 511 int expon = 2; // expon <= will not extend the field 510 while( pow(fieldSize, expon) < degMax)512 while(::pow(fieldSize, expon) < degMax) 511 513 { 512 514 expon++; … … 515 517 if(k > 1) 516 518 { 517 if( pow(p,k * expon) < (1<<16))519 if(::pow(p,k * expon) < (1<<16)) 518 520 { 519 521 setCharacteristic(p, k * expon, 'b'); … … 539 541 else 540 542 { 541 if( pow(p,k * expon) < (1<<16))543 if(::pow(p,k * expon) < (1<<16)) 542 544 { 543 545 setCharacteristic(p, k * expon, 'a');
Note: See TracChangeset
for help on using the changeset viewer.