Changeset 15913a6 in git for factory/facFqBivar.cc

Timestamp:

Mar 26, 2013, 3:57:35 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

0089393ba2915e65e112c7e3ef5279e5bd56fbe1

Parents:

d4b25e07575f90d19a7fc324664d102ae84e47ad0dff6bc7750e8ac23591245c682dede4e272698b

Message:

Merge pull request #311 from mmklee/factory_opt_sw

chg: threshold for using FLINT factorization over Z/p

File:

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

factory/facFqBivar.cc

@@ -232 +232 @@
   {
 #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 (degree (A) < 300)
+    {
+      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
+#endif
     if (getCharacteristic() > 2)
     {
@@ -260 +264 @@
                                                           x);
     }
-#endif
   }
   CFList uniFactors;