Changeset 18a660 in git

Timestamp:

May 7, 2012, 12:46:27 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d1dc39c88c35e4e841172de4d665ea81299444d6

Parents:

edd81896e7de840500b43eca5d7771d36a211f79

git-author:

Martin Lee <martinlee84@web.de>2012-05-07 12:46:27+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-07 18:19:00+02:00

Message:

chg: use FLINT in bivariate factorization

File:

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

factory/facFqBivar.cc

@@ -41 +41 @@
 #include "NTLconvert.h"
 
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+#endif
+
 TIMING_DEFINE_PRINT(fac_uni_factorizer)
 TIMING_DEFINE_PRINT(fac_hensel_lift12)
@@ -145 +149 @@
 {
   Variable x= A.mvar();
-  ASSERT (A.isUnivariate() || A.inCoeffDomain(), 
+  if (A.inCoeffDomain())
+    return CFList();
+  ASSERT (A.isUnivariate(),
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
@@ -215 +221 @@
   else
   {
+#ifdef HAVE_FLINT
+    nmod_poly_t FLINTA;
+    convertFacCF2nmod_poly_t (FLINTA, A);
+    nmod_poly_factor_t result;
+    nmod_poly_factor_init (result);
+    mp_limb_t leadingCoeff= nmod_poly_factor (result, FLINTA);
+    factorsA= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, x);
+    if (factorsA.getFirst().factor().inCoeffDomain())
+      factorsA.removeFirst();
+    nmod_poly_factor_clear (result);
+    nmod_poly_clear (FLINTA);
+#else
     if (getCharacteristic() > 2)
     {
@@ -232 +250 @@
                                                           x);
     }
+#endif
   }
   CFList uniFactors;