Changeset a02e2d in git

Timestamp:

Jun 18, 2020, 4:22:30 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

4c1fc06f2d81e12a8e75a5419444cb157fbe45e9

Parents:

29b4ca5d4228a541041f482cfb466f618a3201bd

Message:

univariate factorization over Z via FLINT

Location:

factory

Files:

• FLINTconvert.cc (modified) (1 diff)
• cf_factor.cc (modified) (2 diffs)

factory/FLINTconvert.cc

@@ -303 +303 @@
   CFFList result;
   long i;
+
+  result.append (CFFactor(convertFmpz2CF(&fac->c),1));
 
   for (i = 0; i < fac->num; i++)

factory/cf_factor.cc

@@ -547 +547 @@
       CanonicalForm ic=icontent(fz);
       fz/=ic;
-      #if 0 // #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
-      // use FLINT
-      fmpz_poly_t f1;
-      convertFacCF2Fmpz_poly_t (f1, fz);
-      fmpz_poly_factor_t result;
-      fmpz_poly_factor_init (result);
-      fmpz_poly_factor_zassenhaus(result, f1);
-      F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar());
-      fmpz_poly_factor_clear (result);
-      fmpz_poly_clear (f1);
+      if (fz.degree()==1)
+      {
+        F=CFFList(CFFactor(fz,1));
+      }
+      else
+      #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
+      {
+        // use FLINT
+        fmpz_poly_t f1;
+        convertFacCF2Fmpz_poly_t (f1, fz);
+        fmpz_poly_factor_t result;
+        fmpz_poly_factor_init (result);
+        fmpz_poly_factor(result, f1);
+        F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar());
+        fmpz_poly_factor_clear (result);
+        fmpz_poly_clear (f1);
+      }
       if ( ! ic.isOne() )
       {
@@ -569 +576 @@
       }
       goto end_char0;
-      #elif defined HAVE_NTL
-      //USE NTL
-      ZZ c;
-      vec_pair_ZZX_long factors;
-      //factorize the converted polynomial
-      factor(c,factors,convertFacCF2NTLZZX(fz));
-
-      //convert the result back to Factory
-      F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      #elif defined(HAVE_NTL)
+      {
+        //USE NTL
+        ZZ c;
+        vec_pair_ZZX_long factors;
+        //factorize the converted polynomial
+        factor(c,factors,convertFacCF2NTLZZX(fz));
+
+        //convert the result back to Factory
+        F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      }
       if ( ! ic.isOne() )
       {