Changeset 4946e3 in git for factory/facAbsBiFact.cc

Timestamp:

Jul 3, 2020, 1:03:03 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

175dfbe8022a34e8c7eab0e37ca15b932dbcb243

Parents:

f3adf3a165dd0f173fe615a55624a41ff34bdddb

Message:

factory: LL via FLINT

File:

• factory/facAbsBiFact.cc (modified) (3 diffs)

factory/facAbsBiFact.cc

@@ -206 +206 @@
 }
 
-#ifdef HAVE_NTL
+#ifdef HAVE_NTL // henselLiftAndEarly
 //G is assumed to be bivariate, irreducible over Q, primitive wrt x and y, compressed
 CFAFList absBiFactorizeMain (const CanonicalForm& G, bool full)
@@ -519 +519 @@
     }
 
+    #ifdef HAVE_FLINT
+    fmpz_mat_t FLINTM;
+    convertFacCFMatrix2Fmpz_mat_t(FLINTM,*M);
+    fmpq_t delta,eta;
+    fmpq_init(delta); fmpq_set_si(delta,1,1);
+    fmpq_init(eta); fmpq_set_si(eta,3,4);
+    fmpz_mat_transpose(FLINTM,FLINTM);
+    fmpz_mat_lll_storjohann(FLINTM,delta,eta);
+    fmpz_mat_transpose(FLINTM,FLINTM);
+    delete M;
+    M=convertFmpz_mat_t2FacCFMatrix(FLINTM);
+    fmpz_mat_clear(FLINTM);
+    #elif defined(HAVE_NTL)
     mat_ZZ * NTLM= convertFacCFMatrix2NTLmat_ZZ (*M);
 
@@ -529 +542 @@
     M= convertNTLmat_ZZ2FacCFMatrix (*NTLM);
     delete NTLM;
+    #endif
 
     mipo= 0;