Changeset ae3775 in git for factory/cf_factor.cc

Timestamp:

Dec 20, 2011, 1:49:30 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7cb55903f606ba30490caea7d1b11dd71bfeb340

Parents:

7e8c9ef034b643eea4e3a9dfb0885856e6d1a5eb

git-author:

Martin Lee <martinlee84@web.de>2011-12-20 00:49:30+00:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:24+02:00

Message:

chg: use Flint factorization over finite fields instead of NTL

File:

• factory/cf_factor.cc (modified) (2 diffs)

factory/cf_factor.cc

@@ -40 +40 @@
 
 #include <factory/cf_gmp.h>
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+#endif
 
 int getExp(); /* cf_char.cc */
@@ -430 +433 @@
     if (f.isUnivariate())
     {
-      #ifdef HAVE_NTL
+#ifdef HAVE_FLINT
+      nmod_poly_t f1;
+      convertFacCF2nmod_poly_t (f1, f);
+      nmod_poly_factor_t result;
+      nmod_poly_factor_init (result);
+      mp_limb_t leadingCoeff= nmod_poly_factor (result, f1);
+      F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
+      nmod_poly_factor_clear (result);
+#else ifdef HAVE_NTL
       if (isOn(SW_USE_NTL) && (isPurePoly(f)))
       {