Changeset a02e2d in git
 Timestamp:
 Jun 18, 2020, 4:22:30 PM (4 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
 Children:
 4c1fc06f2d81e12a8e75a5419444cb157fbe45e9
 Parents:
 29b4ca5d4228a541041f482cfb466f618a3201bd
 Location:
 factory
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

factory/FLINTconvert.cc
r29b4ca ra02e2d 303 303 CFFList result; 304 304 long i; 305 306 result.append (CFFactor(convertFmpz2CF(&fac>c),1)); 305 307 306 308 for (i = 0; i < fac>num; i++) 
factory/cf_factor.cc
r29b4ca ra02e2d 547 547 CanonicalForm ic=icontent(fz); 548 548 fz/=ic; 549 #if 0 // #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504) 550 // use FLINT 551 fmpz_poly_t f1; 552 convertFacCF2Fmpz_poly_t (f1, fz); 553 fmpz_poly_factor_t result; 554 fmpz_poly_factor_init (result); 555 fmpz_poly_factor_zassenhaus(result, f1); 556 F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar()); 557 fmpz_poly_factor_clear (result); 558 fmpz_poly_clear (f1); 549 if (fz.degree()==1) 550 { 551 F=CFFList(CFFactor(fz,1)); 552 } 553 else 554 #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504) 555 { 556 // use FLINT 557 fmpz_poly_t f1; 558 convertFacCF2Fmpz_poly_t (f1, fz); 559 fmpz_poly_factor_t result; 560 fmpz_poly_factor_init (result); 561 fmpz_poly_factor(result, f1); 562 F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar()); 563 fmpz_poly_factor_clear (result); 564 fmpz_poly_clear (f1); 565 } 559 566 if ( ! ic.isOne() ) 560 567 { … … 569 576 } 570 577 goto end_char0; 571 #elif defined HAVE_NTL 572 //USE NTL 573 ZZ c; 574 vec_pair_ZZX_long factors; 575 //factorize the converted polynomial 576 factor(c,factors,convertFacCF2NTLZZX(fz)); 577 578 //convert the result back to Factory 579 F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar()); 578 #elif defined(HAVE_NTL) 579 { 580 //USE NTL 581 ZZ c; 582 vec_pair_ZZX_long factors; 583 //factorize the converted polynomial 584 factor(c,factors,convertFacCF2NTLZZX(fz)); 585 586 //convert the result back to Factory 587 F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar()); 588 } 580 589 if ( ! ic.isOne() ) 581 590 {
Note: See TracChangeset
for help on using the changeset viewer.