Changeset 4946e3 in git for factory/cf_hnf.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

175dfbe8022a34e8c7eab0e37ca15b932dbcb243

Parents:

f3adf3a165dd0f173fe615a55624a41ff34bdddb

Message:

factory: LL via FLINT

File:

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

factory/cf_hnf.cc

@@ -14 +14 @@
 #include "config.h"
 
+#include "canonicalform.h"
+#include "cf_defs.h"
+#include "cf_hnf.h"
 
 #ifdef HAVE_NTL
 #include "NTLconvert.h"
-#include "canonicalform.h"
-#include "cf_defs.h"
-#include "cf_hnf.h"
 #include <NTL/mat_ZZ.h>
 #include <NTL/HNF.h>
 #include <NTL/LLL.h>
+#endif
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+#endif
 
 /**
@@ -38 +43 @@
 CFMatrix* cf_HNF(CFMatrix& A)
 {
+#ifdef HAVE_FLINT
+  fmpz_mat_t FLINTM;
+  convertFacCFMatrix2Fmpz_mat_t(FLINTM,A);
+  fmpz_mat_hnf(FLINTM,FLINTM);
+  CFMatrix *r=convertFmpz_mat_t2FacCFMatrix(FLINTM);
+  fmpz_mat_clear(FLINTM);
+  return r;
+#elif defined(HAVE_NTL)
   mat_ZZ *AA=convertFacCFMatrix2NTLmat_ZZ(A);
   ZZ DD=convertFacCF2NTLZZ(determinant(A,A.rows()));
@@ -44 +57 @@
   delete AA;
   return convertNTLmat_ZZ2FacCFMatrix(WW);
+#endif
 }
 
 CFMatrix* cf_LLL(CFMatrix& A)
 {
+#ifdef HAVE_FLINT
+  fmpz_mat_t FLINTM;
+  convertFacCFMatrix2Fmpz_mat_t(FLINTM,A);
+  fmpq_t delta,eta;
+  fmpq_init(delta); fmpq_set_si(delta,1,1);
+  fmpq_init(eta); fmpq_set_si(eta,3,4);
+  fmpz_mat_lll_storjohann(FLINTM,delta,eta);
+  CFMatrix *r=convertFmpz_mat_t2FacCFMatrix(FLINTM);
+  fmpz_mat_clear(FLINTM);
+  return r;
+#elif defined(HAVE_NTL)
   mat_ZZ *AA=convertFacCFMatrix2NTLmat_ZZ(A);
-  #if 0
-  LLL_RR(*AA);
-  #else
   ZZ det2;
   LLL(det2,*AA,0L);
-  #endif
   CFMatrix *r= convertNTLmat_ZZ2FacCFMatrix(*AA);
   delete AA;
   return r;
+#endif
 }
-#endif