Changeset 45e474 in git

Timestamp:

Dec 16, 2013, 5:47:14 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

84ac5994873dbb564fbbae08f3f16a378f8abfa0

Parents:

0ebf2c731d149c10e2377cfd061cddf19c85502b

git-author:

Martin Lee <martinlee84@web.de>2013-12-16 17:47:14+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:03+01:00

Message:

chg: use FLINT to factorize polys over Fq in facFqBivar

File:

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

factory/facFqBivar.cc

@@ -163 +163 @@
           "univariate polynomial expected or constant expected");
   CFFList factorsA;
+#ifndef HAVE_FLINT
   if (fac_NTL_char != getCharacteristic())
   {
@@ -168 +169 @@
     zz_p::init (getCharacteristic());
   }
+#endif
   if (GF)
   {
@@ -178 +180 @@
     if (getCharacteristic() > 2)
     {
+#if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
+      nmod_poly_t FLINTmipo, leadingCoeff;
+      fq_nmod_ctx_t fq_con;
+      fq_nmod_poly_t FLINTA;
+      fq_nmod_poly_factor_t FLINTFactorsA;
+
+      nmod_poly_init (FLINTmipo, getCharacteristic());
+      convertFacCF2nmod_poly_t (FLINTmipo, mipo.mapinto());
+
+      fq_nmod_ctx_init_modulus (fq_con, FLINTmipo, "Z");
+
+      convertFacCF2Fq_nmod_poly_t (FLINTA, A, fq_con);
+      fq_nmod_poly_make_monic (FLINTA, FLINTA, fq_con);
+
+      fq_nmod_poly_factor_init (FLINTFactorsA, fq_con);
+      nmod_poly_init (leadingCoeff, getCharacteristic());
+
+      fq_nmod_poly_factor (FLINTFactorsA, leadingCoeff, FLINTA, fq_con);
+
+      factorsA= convertFLINTFq_nmod_poly_factor2FacCFFList (FLINTFactorsA, x, beta, fq_con);
+
+      fq_nmod_poly_factor_clear (FLINTFactorsA, fq_con);
+      fq_nmod_poly_clear (FLINTA, fq_con);
+      nmod_poly_clear (FLINTmipo);
+      nmod_poly_clear (leadingCoeff);
+      fq_nmod_ctx_clear (fq_con);
+#else
       zz_pX NTLMipo= convertFacCF2NTLzzpX (mipo.mapinto());
       zz_pE::init (NTLMipo);
@@ -186 +215 @@
       factorsA= convertNTLvec_pair_zzpEX_long2FacCFFList (NTLFactorsA, multi,
                                                          x, beta);
+#endif
     }
     else
@@ -210 +240 @@
     if (getCharacteristic() > 2)
     {
+#if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
+      nmod_poly_t FLINTmipo, leadingCoeff;
+      fq_nmod_ctx_t fq_con;
+      fq_nmod_poly_t FLINTA;
+      fq_nmod_poly_factor_t FLINTFactorsA;
+
+      nmod_poly_init (FLINTmipo, getCharacteristic());
+      convertFacCF2nmod_poly_t (FLINTmipo, getMipo (alpha));
+
+      fq_nmod_ctx_init_modulus (fq_con, FLINTmipo, "Z");
+
+      convertFacCF2Fq_nmod_poly_t (FLINTA, A, fq_con);
+      fq_nmod_poly_make_monic (FLINTA, FLINTA, fq_con);
+
+      fq_nmod_poly_factor_init (FLINTFactorsA, fq_con);
+      nmod_poly_init (leadingCoeff, getCharacteristic());
+
+      fq_nmod_poly_factor (FLINTFactorsA, leadingCoeff, FLINTA, fq_con);
+
+      factorsA= convertFLINTFq_nmod_poly_factor2FacCFFList (FLINTFactorsA, x, alpha, fq_con);
+
+      fq_nmod_poly_factor_clear (FLINTFactorsA, fq_con);
+      fq_nmod_poly_clear (FLINTA, fq_con);
+      nmod_poly_clear (FLINTmipo);
+      nmod_poly_clear (leadingCoeff);
+      fq_nmod_ctx_clear (fq_con);
+#else
       zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
       zz_pE::init (NTLMipo);
@@ -218 +275 @@
       factorsA= convertNTLvec_pair_zzpEX_long2FacCFFList (NTLFactorsA, multi,
                                                            x, alpha);
+#endif
     }
     else