Changeset f87a54f in git for factory/facFqBivar.cc

Timestamp:

Jun 26, 2020, 10:28:29 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

9084a3bd47a1b5b8a96897a02c274a361e4e2c9c

Parents:

03c74248d7037dfb2bedf7c2fa4b550676cb7333

Message:

factory: compile with ntl /without flint

File:

• factory/facFqBivar.cc (modified) (3 diffs)

factory/facFqBivar.cc

@@ -800 +800 @@
 Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
 {
-  #if 0//#ifdef HAVE_NTL
+  #if defined(HAVE_FLINT)
+  nmod_poly_t Irredpoly;
+  nmod_poly_init(Irredpoly,getCharacteristic());
+  #elif defined(HAVE_NTL)
   if (fac_NTL_char != getCharacteristic())
   {
@@ -807 +810 @@
   }
   zz_pX NTLIrredpoly;
-  #elif defined(HAVE_FLINT)
-  nmod_poly_t Irredpoly;
-  nmod_poly_init(Irredpoly,getCharacteristic());
   #endif
   int i=1, m= 2;
@@ -833 +833 @@
     i= degree (getMipo (alpha))/m + 1;
   }
-  #if 0 //#ifdef HAVE_NTL
+  #if defined(HAVE_FLINT)
+  nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
+  CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
+  #elif defined(HAVE_NTL)
   BuildIrred (NTLIrredpoly, i*m);
   CanonicalForm newMipo= convertNTLzzpX2CF (NTLIrredpoly, Variable (1));
-  #elif defined(HAVE_FLINT)
-  nmod_poly_randtest_monic_irreducible(Irredpoly,FLINTrandom,i*m+1);
-  CanonicalForm newMipo= convertnmod_poly_t2FacCF(Irredpoly,Variable (1));
   #endif
   return rootOf (newMipo);