Changeset f87a54f in git


Ignore:
Timestamp:
Jun 26, 2020, 10:28:29 PM (3 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
9084a3bd47a1b5b8a96897a02c274a361e4e2c9c
Parents:
03c74248d7037dfb2bedf7c2fa4b550676cb7333
Message:
factory: compile with ntl /without flint
File:
1 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqBivar.cc

    r03c742 rf87a54f  
    800800Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
    801801{
    802   #if 0//#ifdef HAVE_NTL
     802  #if defined(HAVE_FLINT)
     803  nmod_poly_t Irredpoly;
     804  nmod_poly_init(Irredpoly,getCharacteristic());
     805  #elif defined(HAVE_NTL)
    803806  if (fac_NTL_char != getCharacteristic())
    804807  {
     
    807810  }
    808811  zz_pX NTLIrredpoly;
    809   #elif defined(HAVE_FLINT)
    810   nmod_poly_t Irredpoly;
    811   nmod_poly_init(Irredpoly,getCharacteristic());
    812812  #endif
    813813  int i=1, m= 2;
     
    833833    i= degree (getMipo (alpha))/m + 1;
    834834  }
    835   #if 0 //#ifdef HAVE_NTL
     835  #if defined(HAVE_FLINT)
     836  nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
     837  CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
     838  #elif defined(HAVE_NTL)
    836839  BuildIrred (NTLIrredpoly, i*m);
    837840  CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
    838   #elif defined(HAVE_FLINT)
    839   nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
    840   CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
    841841  #endif
    842842  return rootOf (newMipo);
Note: See TracChangeset for help on using the changeset viewer.