Changeset 03c742 in git for factory/cf_irred.cc

Timestamp:

Jun 26, 2020, 6:03:59 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f87a54f01779194a0163ca39873f5b4255a4f510

Parents:

b666c768103c724ed3617954c684de0e621144d2

Message:

factory: BuildIrred, FLINT/NTL seperation

File:

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

factory/cf_irred.cc

@@ -14 +14 @@
 #ifdef HAVE_NTL
 #include "NTLconvert.h"
+#endif
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
 #endif
 
@@ -36 +40 @@
 }
 
-#ifdef HAVE_NTL
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 /// computes a random monic irreducible univariate polynomial in x over Fp of
-/// degree i via NTL
+/// degree i via NTL/FLINT
 CanonicalForm
 randomIrredpoly (int i, const Variable & x)
 {
   int p= getCharacteristic();
+  #ifdef HAVE_FLINT
+  nmod_poly_t Irredpoly;
+  nmod_poly_init(Irredpoly,p);
+  nmod_poly_randtest_monic_irreducible(Irredpoly, FLINTrandom, i+1);
+  CanonicalForm CFirredpoly=convertnmod_poly_t2FacCF(Irredpoly,Variable(1));
+  nmod_poly_clear(Irredpoly);
+  #elif defined(HAVE_NTL)
   if (fac_NTL_char != p)
   {
@@ -49 +60 @@
   }
   zz_pX NTLirredpoly;
-  CanonicalForm CFirredpoly;
   BuildIrred (NTLirredpoly, i);
-  CFirredpoly= convertNTLzzpX2CF (NTLirredpoly, x);
+  CanonicalForm CFirredpoly= convertNTLzzpX2CF (NTLirredpoly, x);
+  #endif
   return CFirredpoly;
 }