Changeset 1f4ed3 in git

Timestamp:

Dec 16, 2013, 2:41:46 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

1a688bac5a4cda9259d2e3370e235dae6231fc16

Parents:

fc25d7148572ee90d065637f58166dac76c41c53

git-author:

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

git-committer:

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

Message:

chg: use for univariate factorization over Fq

File:

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

factory/cf_factor.cc

@@ -657 +657 @@
       if (ch>2)
       {
+#if (HAVE_FLINT && __FLINT_VERSION_MINOR >= 4)
+        nmod_poly_t FLINTmipo, leadingCoeff;
+        fq_nmod_ctx_t fq_con;
+
+        nmod_poly_init (FLINTmipo, getCharacteristic());
+        nmod_poly_init (leadingCoeff, getCharacteristic());
+        convertFacCF2nmod_poly_t (FLINTmipo, getMipo (alpha));
+
+        fq_nmod_ctx_init_modulus (fq_con, FLINTmipo, "Z");
+        fq_nmod_poly_t FLINTF;
+        convertFacCF2Fq_nmod_poly_t (FLINTF, f, fq_con);
+        fq_nmod_poly_factor_t res;
+        fq_nmod_poly_factor_init (res, fq_con);
+        fq_nmod_poly_factor (res, leadingCoeff, FLINTF, fq_con);
+        F= convertFLINTFq_nmod_poly_factor2FacCFFList (res, f.mvar(), alpha, fq_con);
+        F.insert (CFFactor (Lc (f), 1));
+
+        fq_nmod_poly_factor_clear (res, fq_con);
+        fq_nmod_poly_clear (FLINTF, fq_con);
+        nmod_poly_clear (FLINTmipo);
+        nmod_poly_clear (leadingCoeff);
+        fq_nmod_ctx_clear (fq_con);
+#else
         // First all cases with characteristic !=2
         // set remainder
@@ -682 +705 @@
         // return converted result
         F=convertNTLvec_pair_zzpEX_long2FacCFFList(factors,leadcoeff,f.mvar(),alpha);
+#endif
       }
       else if (/*getCharacteristic()*/ch==2)