Changeset 6e12a45 in git

Timestamp:

Jun 17, 2020, 6:16:48 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

cac0f8a0c0c0b22b71b76c3b44841f5cc1fec229

Parents:

ed6f2bb0876535189130e32d71be46f776012a36

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-06-17 18:16:48+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-06-17 18:17:49+02:00

Message:

univariate factorization over Z via FLINT

Location:

factory

Files:

• FLINTconvert.cc (modified) (1 diff)
• FLINTconvert.h (modified) (1 diff)
• cf_factor.cc (modified) (3 diffs)

factory/FLINTconvert.cc

@@ -291 +291 @@
   return result;
 }
+
+#if __FLINT_RELEASE >= 20503
+CFFList
+convertFLINTfmpz_poly_factor2FacCFFList (
+                   const fmpz_poly_factor_t fac, ///< [in] a nmod_poly_factor_t
+                   const Variable& x       ///< [in] variable the result should
+                                           ///< have
+                                        )
+
+{
+  CFFList result;
+  long i;
+
+  for (i = 0; i < fac->num; i++)
+    result.append (CFFactor (convertFmpz_poly_t2FacCF (
+                             (fmpz_poly_t &)fac->p[i],x),
+                             fac->exp[i]));
+  return result;
+}
+#endif
 
 #if __FLINT_RELEASE >= 20400

factory/FLINTconvert.h

@@ -120 +120 @@
                                         );
 
+/// conversion of a FLINT factorization over Z to a CFFList
+CFFList
+convertFLINTfmpz_poly_factor2FacCFFList (
+                   const fmpz_poly_factor_t fac, ///< [in] a fmpz_poly_factor_t
+                   const Variable& x       ///< [in] variable the result should
+                                           ///< have
+                                        );
+
 /// conversion of a factory univariate poly over Z to a FLINT poly over
 /// Z/p (for non word size p)

factory/cf_factor.cc

@@ -536 +536 @@
     }
   }
-  else
+  else // char 0
   {
     bool on_rational = isOn(SW_RATIONAL);
@@ -575 +575 @@
         }
       }
-      #else
-      factoryError ("univariate factorization over Z depends on NTL(missing)");
+      if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);
+      return F;
+      #endif
+      #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
+      // use FLINT
+      fmpz_poly_t f1;
+      convertFacCF2Fmpz_poly_t (f1, f);
+      fmpz_poly_factor_t result;
+      fmpz_poly_factor_init (result);
+      fmpz_poly_factor_zassenhaus(result, f1);
+      F= convertFLINTfmpz_poly_factor2FacCFFList (result, f.mvar());
+      fmpz_poly_factor_clear (result);
+      fmpz_poly_clear (f1);
+      if(isOn(SW_USE_NTL_SORT)) F.sort(cmpCF);
+      return F;
+      #endif
+      #if !defined(AHE_NTL) && !defined(HAVE_FLINT)
+      factoryError ("univariate factorization over Z depends on NTL/FLINT(missing)");
       return CFFList (CFFactor (f, 1));
       #endif
     }
-    else
+    else // not univariate,  char 0
     {
       On (SW_RATIONAL);
@@ -586 +602 @@
       {
         CFList factors;
+        #ifdef HAVE_NTL
         factors= ratSqrfFactorize (fz);
         for (CFListIterator i= factors; i.hasItem(); i++)
           F.append (CFFactor (i.getItem(), 1));
+        #else
+        factoryError ("multivariate factorization over Z depends on NTL(missing)");
+        return CFFList (CFFactor (f, 1));
+        #endif
       }
       else