Changeset 0dff6bc in git

Timestamp:

Mar 22, 2013, 4:59:20 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

15913a696349fcc40d93d2f1edb152b6effea44a

Parents:

d4b25e07575f90d19a7fc324664d102ae84e47ad

git-author:

Martin Lee <martinlee84@web.de>2013-03-22 16:59:20+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-26 14:36:56+01:00

Message:

chg: threshold for using FLINT factorization over Z/p

Location:

factory

Files:

• cf_factor.cc (modified) (2 diffs)
• facFqBivar.cc (modified) (2 diffs)

factory/cf_factor.cc

@@ -430 +430 @@
     if (f.isUnivariate())
     {
+#ifdef HAVE_NTL
 #ifdef HAVE_FLINT
-      nmod_poly_t f1;
-      convertFacCF2nmod_poly_t (f1, f);
-      nmod_poly_factor_t result;
-      nmod_poly_factor_init (result);
-      mp_limb_t leadingCoeff= nmod_poly_factor (result, f1);
-      F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
-      nmod_poly_factor_clear (result);
-      nmod_poly_clear (f1);
-#else
-#ifdef HAVE_NTL
+      if (degree (f) < 300)
+      {
+        nmod_poly_t f1;
+        convertFacCF2nmod_poly_t (f1, f);
+        nmod_poly_factor_t result;
+        nmod_poly_factor_init (result);
+        mp_limb_t leadingCoeff= nmod_poly_factor (result, f1);
+        F= convertFLINTnmod_poly_factor2FacCFFList (result, leadingCoeff, f.mvar());
+        nmod_poly_factor_clear (result);
+        nmod_poly_clear (f1);
+      }
+      else
+#endif
       if (isOn(SW_USE_NTL) && (isPurePoly(f)))
       {
@@ -546 +550 @@
           F=FpFactorizeUnivariateCZ( f, issqrfree, 0, Variable(), Variable() );
       }
-#endif //HAVE_FLINT
     }
     else

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;