Changeset 860d71 in git for factory/cf_gcd_smallp.cc
- Timestamp:
- May 11, 2012, 3:10:11 PM (12 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 0d1984ff9810b1f329e5aea72c3390fe48bc5e63
- Parents:
- b0ca43c93260d239fb0b76a8aa762b1ea55d09a2845c26085348f7b5e0c6e14ec73d58120fe1aa80
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
factory/cf_gcd_smallp.cc
rb0ca43c r860d71 41 41 42 42 #ifdef HAVE_NTL 43 #include <NTL/ZZ_pEX.h>44 43 #include <NTLconvert.h> 45 44 #endif … … 435 434 { 436 435 int p= getCharacteristic(); 437 ZZ NTLp= to_ZZ (p); 438 ZZ_p::init (NTLp); 439 ZZ_pX NTLirredpoly; 436 zz_p::init (p); 437 zz_pX NTLirredpoly; 440 438 //TODO: replace d by max_{i} (deg_x{i}(f)) 441 439 int i= (int) (log ((double) ipower (d + 1, num_vars))/log ((double) p)); … … 444 442 i= 2; 445 443 BuildIrred (NTLirredpoly, i*m); 446 CanonicalForm mipo= convertNTL ZZpX2CF (NTLirredpoly, Variable(1));444 CanonicalForm mipo= convertNTLzzpX2CF (NTLirredpoly, Variable(1)); 447 445 beta= rootOf (mipo); 448 446 } … … 1335 1333 { 1336 1334 int p= getCharacteristic(); 1337 ZZ NTLp= to_ZZ (p); 1338 ZZ_p::init (NTLp); 1339 ZZ_pX NTLirredpoly; 1335 zz_p::init (p); 1336 zz_pX NTLirredpoly; 1340 1337 CanonicalForm CFirredpoly; 1341 1338 BuildIrred (NTLirredpoly, i + 1); 1342 CFirredpoly= convertNTL ZZpX2CF (NTLirredpoly, x);1339 CFirredpoly= convertNTLzzpX2CF (NTLirredpoly, x); 1343 1340 return CFirredpoly; 1344 1341 }
Note: See TracChangeset
for help on using the changeset viewer.