Changeset cac0f8 in git

Timestamp:

Jun 17, 2020, 10:17:41 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

329dd32beeab3db0280ea4a24f56b6a03cf155c7

Parents:

6e12a4509235103a5e009837c0a1ae25ff078e5b

Message:

temp. disable factore over Z via FLINT

File:

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

factory/cf_factor.cc

@@ -545 +545 @@
     if ( f.isUnivariate() )
     {
-      #ifdef HAVE_NTL
-      //USE NTL
       CanonicalForm ic=icontent(fz);
       fz/=ic;
-      ZZ c;
-      vec_pair_ZZX_long factors;
-      //factorize the converted polynomial
-      factor(c,factors,convertFacCF2NTLZZX(fz));
-
-      //convert the result back to Factory
-      F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      #if 0 // #if defined(HAVE_FLINT) && (__FLINT_RELEASE>=20504)
+      // use FLINT
+      fmpz_poly_t f1;
+      convertFacCF2Fmpz_poly_t (f1, fz);
+      fmpz_poly_factor_t result;
+      fmpz_poly_factor_init (result);
+      fmpz_poly_factor_zassenhaus(result, f1);
+      F= convertFLINTfmpz_poly_factor2FacCFFList (result, fz.mvar());
+      fmpz_poly_factor_clear (result);
+      fmpz_poly_clear (f1);
       if ( ! ic.isOne() )
       {
@@ -567 +568 @@
           F.insert( CFFactor( ic ) );
       }
+      goto end_char0;
+      #elif defined HAVE_NTL
+      //USE NTL
+      ZZ c;
+      vec_pair_ZZX_long factors;
+      //factorize the converted polynomial
+      factor(c,factors,convertFacCF2NTLZZX(fz));
+
+      //convert the result back to Factory
+      F=convertNTLvec_pair_ZZX_long2FacCFFList(factors,c,fz.mvar());
+      if ( ! ic.isOne() )
+      {
+        if ( F.getFirst().factor().inCoeffDomain() )
+        {
+          CFFactor new_first( F.getFirst().factor() * ic );
+          F.removeFirst();
+          F.insert( new_first );
+        }
+        else
+          F.insert( CFFactor( ic ) );
+      }
       else
       {
@@ -575 +597 @@
         }
       }
-      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)
+      goto end_char0;
+      #else
       factoryError ("univariate factorization over Z depends on NTL/FLINT(missing)");
       return CFFList (CFFactor (f, 1));
@@ -616 +623 @@
     }
 
+end_char0:
     if ( on_rational )
       On(SW_RATIONAL);