Changeset 692aed in git for factory

Timestamp:

Sep 14, 2012, 5:23:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

49660c91b075bf44c9cee29176507b1e9bc2e496

Parents:

4604b84fc397bca4fcd80a0d3b01bfdb7a7fdb76

git-author:

Martin Lee <martinlee84@web.de>2012-09-14 17:23:35+02:00

git-committer:

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

Message:

chg: added conversion of matrices to FLINT matrices

Location:

factory

Files:

• FLINTconvert.cc (modified) (2 diffs)
• FLINTconvert.h (modified) (2 diffs)

factory/FLINTconvert.cc

@@ -42 +42 @@
 #include <flint/nmod_poly.h>
 #include <flint/fmpq_poly.h>
+#include <flint/nmod_mat.h>
+#include <flint/fmpz_mat.h>
 #ifdef __cplusplus
 }
@@ -299 +301 @@
 }
 
-#endif
-
-
+void convertFacCFMatrix2Fmpz_mat_t (fmpz_mat_t M, CFMatrix &m)
+{
+  fmpz_mat_init (M, (long) m.rows(), (long) m.columns());
+
+  int i,j;
+  for(i=m.rows();i>0;i--)
+  {
+    for(j=m.columns();j>0;j--)
+    {
+      convertCF2Fmpz (fmpz_mat_entry (M,i-1,j-1), m(i,j));
+    }
+  }
+}
+CFMatrix* convertFmpz_mat_t2FacCFMatrix(fmpz_mat_t m)
+{
+  CFMatrix *res=new CFMatrix(fmpz_mat_nrows (m),fmpz_mat_ncols (m));
+  int i,j;
+  for(i=res->rows();i>0;i--)
+  {
+    for(j=res->columns();j>0;j--)
+    {
+      (*res)(i,j)=convertFmpz2CF(fmpz_mat_entry (m,i-1,j-1));
+    }
+  }
+  return res;
+}
+
+void convertFacCFMatrix2nmod_mat_t (nmod_mat_t M, CFMatrix &m)
+{
+  nmod_mat_init (M, (long) m.rows(), (long) m.columns(), getCharacteristic());
+
+  bool save_sym_ff= isOn (SW_SYMMETRIC_FF);
+  if (save_sym_ff) Off (SW_SYMMETRIC_FF);
+  int i,j;
+  for(i=m.rows();i>0;i--)
+  {
+    for(j=m.columns();j>0;j--)
+    {
+      if(!(m(i,j)).isImm()) printf("convertFacCFMatrix2FLINTmat_zz_p: not imm.\n");
+      nmod_mat_entry (M,i-1,j-1)= (m(i,j)).intval();
+    }
+  }
+  if (save_sym_ff) On (SW_SYMMETRIC_FF);
+}
+
+CFMatrix* convertNmod_mat_t2FacCFMatrix(nmod_mat_t m)
+{
+  CFMatrix *res=new CFMatrix(nmod_mat_nrows (m), nmod_mat_ncols (m));
+  int i,j;
+  for(i=res->rows();i>0;i--)
+  {
+    for(j=res->columns();j>0;j--)
+    {
+      (*res)(i,j)=CanonicalForm((long) nmod_mat_entry (m, i-1, j-1));
+    }
+  }
+  return res;
+}
+
+#endif
+
+

factory/FLINTconvert.h

@@ -33 +33 @@
 #include <flint/fmpq_poly.h>
 #include <flint/nmod_poly.h>
+#include <flint/nmod_mat.h>
+#include <flint/fmpz_mat.h>
 #ifdef __cplusplus
 }
@@ -132 +134 @@
                              );
 
+/// conversion of a factory matrix over Z to a fmpz_mat_t
+void convertFacCFMatrix2Fmpz_mat_t (fmpz_mat_t M, ///<[in,out] fmpz_mat_t
+                                    CFMatrix &m   ///<[in] matrix over Z
+                                   );
+
+/// conversion of a FLINT matrix over Z to a factory matrix
+CFMatrix* convertFmpz_mat_t2FacCFMatrix(fmpz_mat_t m ///<[in] fmpz_mat_t
+                                       );
+
+/// conversion of a factory matrix over Z/p to a nmod_mat_t
+void convertFacCFMatrix2nmod_mat_t (nmod_mat_t M, ///<[in,out] nmod_mat_t
+                                    CFMatrix &m   ///<[in] matrix over Z/p
+                                   );
+
+/// conversion of a FLINT matrix over Z/p to a factory matrix
+CFMatrix* convertNmod_mat_t2FacCFMatrix(nmod_mat_t m ///<[in] nmod_mat_t
+                                       );
+
 #endif
 #endif