Changeset c13ebd in git for factory/facBivar.cc

Timestamp:

Jun 29, 2020, 5:57:05 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

e64ec88de66303fe1a011fc6de0230f0d45acc5a

Parents:

168e13c73f575fd0acbcbd8dece921aaacd1abe5

Message:

factory: discriminant from FLINT

File:

• factory/facBivar.cc (modified) (5 diffs)

factory/facBivar.cc

@@ -184 +184 @@
 }
 
-#ifdef HAVE_NTL // resultatnt(ZZ), discrimeninat
+#ifdef HAVE_NTL // henselLiftAndEarly
 CFList biFactorize (const CanonicalForm& F, const Variable& v)
 {
@@ -526 +526 @@
     mipoHasDen= !bCommonDen(mipo).isOne();
     mipo *= bCommonDen (mipo);
+    #ifdef HAVE_FLINT
+    // init
+    fmpz_t FLINTf,FLINTD;
+    fmpz_init(FLINTf);
+    fmpz_init(FLINTD);
+    fmpz_poly_t FLINTmipo;
+    fmpz_poly_t FLINTLcf;
+    //conversion
+    convertFacCF2Fmpz_poly_t(FLINTmipo,mipo);
+    convertFacCF2Fmpz_poly_t(FLINTLcf,Lc (A*bCommonDen (A)));
+    // resultant, discriminant
+    fmpz_poly_resultant(FLINTf,FLINTmipo,FLINTLcf);
+    fmpz_poly_discriminant(FLINTD,FLINTmipo);
+    fmpz_mul(FLINTf,FLINTD,FLINTf);
+    // conversion
+    den= abs (convertFmpz2CF(FLINTf));
+    // clean up
+    fmpz_clear(FLINTf);
+    // FLINTD is used below
+    fmpz_poly_clear(FLINTLcf);
+    fmpz_poly_clear(FLINTmipo);
+    #elif defined(HAVE_NTL)
     ZZX NTLmipo= convertFacCF2NTLZZX (mipo);
     ZZX NTLLcf= convertFacCF2NTLZZX (Lc (A*bCommonDen (A)));
@@ -531 +553 @@
     ZZ NTLD= discriminant (NTLmipo);
     den= abs (convertZZ2CF (NTLD*NTLf));
+    #endif
 
     // make factors elements of Z(a)[x] disable for modularDiophant
@@ -544 +567 @@
     Off (SW_RATIONAL);
     int i= 0;
+    #ifdef HAVE_FLINT
+    CanonicalForm discMipo= convertFmpz2CF(FLINTD);
+    fmpz_clear(FLINTD);
+    #elif defined(HAVE_NTL)
     CanonicalForm discMipo= convertZZ2CF (NTLD);
+    #endif
     findGoodPrime (F*discMipo,i);
     findGoodPrime (Aeval*discMipo,i);
@@ -608 +636 @@
 }
 #endif
+