Changeset e64ec88 in git for factory/cfModGcd.cc

Timestamp:

Jun 30, 2020, 1:06:38 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f542551517fde5e0e330f2a5f4ae6e3fdfd32454

Parents:

c13ebdc9277f3b41f188d330d716d537518c250d

Message:

factory: gauss via FLINT

File:

• factory/cfModGcd.cc (modified) (9 diffs)

factory/cfModGcd.cc

@@ -1783 +1783 @@
 }
 
-#ifdef HAVE_NTL //gauss, zz_pE
 long
 gaussianElimFq (CFMatrix& M, CFArray& L, const Variable& alpha)
@@ -1799 +1798 @@
     (*N) (j, M.columns() + 1)= L[i];
   int p= getCharacteristic ();
+  #ifdef HAVE_FLINT
+  // convert mipo
+  nmod_poly_t mipo1;
+  convertFacCF2nmod_poly_t(mipo1,getMipo(alpha));
+  fq_nmod_ctx_t ctx;
+  fq_nmod_ctx_init_modulus(ctx,mipo1,"t");
+  nmod_poly_clear(mipo1);
+  // convert matrix
+  fq_nmod_mat_t FLINTN;
+  convertFacCFMatrix2Fq_nmod_mat_t (FLINTN, ctx, *N);
+  // rank
+  long rk= fq_nmod_mat_rref (FLINTN,ctx);
+  // clean up
+  fq_nmod_mat_clear (FLINTN,ctx);
+  fq_nmod_ctx_clear(ctx);
+  #elif defined(HAVE_NTL)
   if (fac_NTL_char != p)
   {
@@ -1808 +1823 @@
   mat_zz_pE *NTLN= convertFacCFMatrix2NTLmat_zz_pE(*N);
   long rk= gauss (*NTLN);
-
+  N= convertNTLmat_zz_pE2FacCFMatrix (*NTLN, alpha);
+  delete NTLN;
+  #endif
   delete N;
-  N= convertNTLmat_zz_pE2FacCFMatrix (*NTLN, alpha);
-
-  delete NTLN;
 
   M= (*N) (1, M.rows(), 1, M.columns());
@@ -1822 +1836 @@
   return rk;
 }
-#endif
 
 CFArray
@@ -1876 +1889 @@
 }
 
-#ifdef HAVE_NTL //gauss, zz_pE
 CFArray
 solveSystemFq (const CFMatrix& M, const CFArray& L, const Variable& alpha)
@@ -1891 +1903 @@
     (*N) (j, M.columns() + 1)= L[i];
   int p= getCharacteristic ();
+  #ifdef HAVE_FLINT
+  // convert mipo
+  nmod_poly_t mipo1;
+  convertFacCF2nmod_poly_t(mipo1,getMipo(alpha));
+  fq_nmod_ctx_t ctx;
+  fq_nmod_ctx_init_modulus(ctx,mipo1,"t");
+  nmod_poly_clear(mipo1);
+  // convert matrix
+  fq_nmod_mat_t FLINTN;
+  convertFacCFMatrix2Fq_nmod_mat_t (FLINTN, ctx, *N);
+  // rank
+  long rk= fq_nmod_mat_rref (FLINTN,ctx);
+  #elif defined(HAVE_NTL)
   if (fac_NTL_char != p)
   {
@@ -1900 +1925 @@
   mat_zz_pE *NTLN= convertFacCFMatrix2NTLmat_zz_pE(*N);
   long rk= gauss (*NTLN);
+  #endif
 
   delete N;
   if (rk != M.columns())
   {
+    #if defined(HAVE_NTL) && !defined(HAVE_FLINT)
     delete NTLN;
+    #endif
     return CFArray();
   }
+  #ifdef HAVE_FLINT
+  // convert and clean up
+  N=convertFq_nmod_mat_t2FacCFMatrix(FLINTN,ctx,alpha);
+  fq_nmod_mat_clear (FLINTN,ctx);
+  fq_nmod_ctx_clear(ctx);
+  #elif defined(HAVE_NTL)
   N= convertNTLmat_zz_pE2FacCFMatrix (*NTLN, alpha);
-
   delete NTLN;
+  #endif
 
   CFArray A= readOffSolution (*N, rk);
@@ -1916 +1950 @@
   return A;
 }
-#endif
 #endif
 
@@ -4222 +4255 @@
   }
 }
-
-
 #endif