Changeset 273a2f in git

Timestamp:

Dec 2, 2021, 3:56:49 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

18bb792edcc6d3f65af0111f93ed61118123ffd1

Parents:

c31a71c38969321615ad9607978783ca23b0edbb

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-12-02 15:56:49+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-12-02 15:59:38+01:00

Message:

experimental: fq_nmod_mat_rref

Files:

• Singular/extra.cc (modified) (1 diff)
• libpolys/polys/flintconv.cc (modified) (2 diffs)
• libpolys/polys/flintconv.h (modified) (2 diffs)

Singular/extra.cc

@@ -3918 +3918 @@
     }
     else
+/* ====== fq_nmod_mat_rref ============================*/
+    #ifdef HAVE_FLINT
+    if(strcmp(sys_cmd,"fq_nmod_mat_rref")==0)
+    {
+      const short t1[]={1,MATRIX_CMD};
+      if (iiCheckTypes(h,t1,1))
+      {
+        matrix M=(matrix)h->Data();
+        fq_nmod_ctx_t ctx;
+        fmpz_t p;
+        convSingIFlintI(p,rChar(currRing));
+        fq_nmod_ctx_init(ctx,p,1,"t");
+        fq_nmod_mat_t FLINTM;
+        // convert matrix
+        convSingMFlintFq_nmod_mat(M,FLINTM,ctx,currRing);
+        // rank
+        long rk= fq_nmod_mat_rref (FLINTM,ctx);
+        res->data=(void*)convFlintFq_nmod_matSingM(FLINTM,ctx,currRing);
+        // clean up
+        fq_nmod_mat_clear (FLINTM,ctx);
+        fq_nmod_ctx_clear(ctx);
+        fmpz_clear(p);
+        res->rtyp=MATRIX_CMD;
+        Print("rank:%ld\n",rk);
+        return FALSE;
+      }
+      else
+      {
+        WerrorS("expected system(\"fq_nmod_mat_rref\",<matrix>)");
+        return TRUE;
+      }
+    }
+    else
+    #endif
 /*==================== Error =================*/
       Werror( "(extended) system(\"%s\",...) %s", sys_cmd, feNotImplemented );

libpolys/polys/flintconv.cc

@@ -14 +14 @@
 #ifdef HAVE_FLINT
 #if __FLINT_RELEASE >= 20500
+
 #include "coeffs/coeffs.h"
 #include "coeffs/longrat.h"
@@ -281 +282 @@
 }
 
+void convSingPFlintnmod_poly_t(nmod_poly_t result, const poly p, const ring r)
+{
+  // assume univariate
+  nmod_poly_init2 (result,rChar(r),p_Deg(p,r)); 
+  poly h=p;
+  while(h!=NULL)
+  {
+    nmod_poly_set_coeff_ui(result,p_GetExp(h,1,r),n_Int(pGetCoeff(h),r->cf));
+    pIter(h);
+  }
+}
+
+void convSingMFlintFq_nmod_mat(matrix m, fq_nmod_mat_t M, const fq_nmod_ctx_t fq_con, const ring r)
+{
+  fq_nmod_mat_init (M, (long)MATROWS(m), (long) MATCOLS(m), fq_con);
+  int i,j;
+  for(i=MATROWS(m);i>0;i--)
+  {
+    for(j=MATCOLS(m);j>0;j--)
+    {
+      convSingPFlintnmod_poly_t (M->rows[i-1]+j-1, MATELEM(m,i,j),r);
+    }
+  }
+}
+
+poly convFlintFq_nmodSingP(const fq_nmod_t Fp, const fq_nmod_ctx_t ctx, const ring r)
+{
+  poly p=NULL;
+  poly h;
+  for (int i= 0; i < nmod_poly_length (Fp); i++)
+  {
+    ulong coeff= nmod_poly_get_coeff_ui (Fp, i);
+    if (coeff != 0)
+    h=p_NSet(n_Init(coeff,r->cf),r);
+    p_SetExp(h,1,i,r);
+    p_Setm(h,r);
+    p=p_Add_q(p,h,r);
+  }
+  return p;
+}
+
+matrix convFlintFq_nmod_matSingM(fq_nmod_mat_t m, const fq_nmod_ctx_t fq_con, const ring r)
+{
+  matrix M=mpNew(fq_nmod_mat_nrows (m, fq_con),fq_nmod_mat_ncols (m, fq_con));
+   int i,j;
+  for(i=MATROWS(M);i>0;i--)
+  {
+    for(j=MATCOLS(M);j>0;j--)
+    {
+      MATELEM(M,i,j)=convFlintFq_nmodSingP(fq_nmod_mat_entry (m, i-1, j-1),
+                                          fq_con, r);
+    }
+  }
+  return M;
+}
+
 bigintmat* singflint_LLL(bigintmat*  m, bigintmat* T)
 {

libpolys/polys/flintconv.h

@@ -37 +37 @@
 #if __FLINT_RELEASE >= 20500
 #include <flint/fmpz_lll.h>
+#include <flint/fq.h>
+#include <flint/fq_poly.h>
+#include <flint/fq_nmod.h>
+#include <flint/fq_nmod_poly.h>
+#include <flint/fq_nmod_mat.h>
 #endif
 
@@ -57 +62 @@
 bigintmat*  singflint_LLL(bigintmat* A, bigintmat* T);
 intvec* singflint_LLL(intvec* A, intvec* T);
+
+#if __FLINT_RELEASE >= 20500
+void convSingPFlintnmod_poly_t(nmod_poly_t result, const poly p, const ring r);
+void convSingMFlintFq_nmod_mat(matrix m, fq_nmod_mat_t M, const fq_nmod_ctx_t fq_con, const ring r);
+poly convFlintFq_nmodSingP(const fq_nmod_t Fp, const fq_nmod_ctx_t ctx, const ring r);
+matrix convFlintFq_nmod_matSingM(fq_nmod_mat_t m, const fq_nmod_ctx_t fq_con, const ring r);
+#endif
 #endif
 #endif