Changeset 8fa570 in git

Timestamp:

Sep 19, 2012, 10:49:21 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7c00d61e3be5c312038a1c42b49fdaea893ae3d1

Parents:

4473497abf51906fba12e775f998ec8cee9d2779

git-author:

Martin Lee <martinlee84@web.de>2012-09-19 10:49:21+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-25 15:11:13+02:00

Message:

chg: use FLINT linear algebra in sparse modular gcd

File:

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

factory/cf_gcd_smallp.cc

@@ -39 +39 @@
 #ifdef HAVE_NTL
 #include <NTLconvert.h>
+#endif
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
 #endif
 
@@ -1981 +1985 @@
   for (int i= 0; i < L.size(); i++, j++)
     (*N) (j, M.columns() + 1)= L[i];
+#ifdef HAVE_FLINT
+  nmod_mat_t FLINTN;
+  convertFacCFMatrix2nmod_mat_t (FLINTN, *N);
+  long* dummy= new long [M.rows()];
+  for (int i= 0; i < M.rows(); i++)
+    dummy[i]= 0;
+  long rk= nmod_mat_rref (dummy, FLINTN);
+
+  N= convertNmod_mat_t2FacCFMatrix (FLINTN);
+  nmod_mat_clear (FLINTN);
+  delete dummy;
+#else
   int p= getCharacteristic ();
   zz_p::init (p);
@@ -1987 +2003 @@
 
   N= convertNTLmat_zz_p2FacCFMatrix (*NTLN);
+#endif
 
   L= CFArray (M.rows());
@@ -2042 +2059 @@
   for (int i= 0; i < L.size(); i++, j++)
     (*N) (j, M.columns() + 1)= L[i];
+
+#ifdef HAVE_FLINT
+  nmod_mat_t FLINTN;
+  convertFacCFMatrix2nmod_mat_t (FLINTN, *N);
+  long* dummy= new long [M.rows()];
+  for (int i= 0; i < M.rows(); i++)
+    dummy[i]= 0;
+  long rk= nmod_mat_rref (dummy, FLINTN);
+#else
   int p= getCharacteristic ();
   zz_p::init (p);
   mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
   long rk= gauss (*NTLN);
+#endif
   if (rk != M.columns())
   {
+#ifdef HAVE_FLINT
+    nmod_mat_clear (FLINTN);
+    delete dummy;
+#endif
     delete N;
     return CFArray();
   }
+#ifdef HAVE_FLINT
+  N= convertNmod_mat_t2FacCFMatrix (FLINTN);
+  nmod_mat_clear (FLINTN);
+  delete dummy;
+#else
   N= convertNTLmat_zz_p2FacCFMatrix (*NTLN);
-
+#endif
   CFArray A= readOffSolution (*N, rk);