Changeset 2ce3bf in git for factory

Timestamp:

Jul 1, 2020, 4:36:02 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cc5a86cc299c9d4d71030662a697af14d56a1bf3

Parents:

c1f4d51f741e0a6c42d18ed86f6d5f207f816516

Message:

fq_nmod_get_nmod_poly/fq_nmod_set_nmod_poly for FLINT < 2.6.1

Location:

factory

Files:

• FLINTconvert.cc (modified) (5 diffs)
• FLINTconvert.h (modified) (1 diff)
• cf_map_ext.cc (modified) (4 diffs)
• facFqSquarefree.cc (modified) (1 diff)

factory/FLINTconvert.cc

@@ -63 +63 @@
 #if ( __FLINT_RELEASE >= 20503)
 #include <flint/fmpq_mpoly.h>
+
+#if (__FLINT_RELEASE < 20601)
+// helper for fq_nmod_t -> nmod_poly_t
+static void fq_nmod_get_nmod_poly(nmod_poly_t a, const fq_nmod_t b, const fq_nmod_ctx_t ctx)
+{
+    FLINT_ASSERT(b->mod.n == ctx->modulus->mod.n);
+    a->mod = ctx->modulus->mod;
+    nmod_poly_set(a, b);
+}
+
+// helper for nmod_poly_t -> fq_nmod_t
+static void fq_nmod_set_nmod_poly(fq_nmod_t a, const nmod_poly_t b, const fq_nmod_ctx_t ctx)
+{
+    FLINT_ASSERT(a->mod.n == b->mod.n);
+    FLINT_ASSERT(a->mod.n == ctx->modulus->mod.n);
+    nmod_poly_set(a, b);
+    fq_nmod_reduce(a, ctx);
+}
+#endif
+
+
 #endif
 #ifdef __cplusplus
@@ -363 +384 @@
   bool save_sym_ff= isOn (SW_SYMMETRIC_FF);
   if (save_sym_ff) Off (SW_SYMMETRIC_FF);
+  nmod_poly_t res;
+  nmod_poly_init(res,getCharacteristic());
   for (CFIterator i= f; i.hasTerms(); i++)
   {
@@ -376 +399 @@
     {
       STICKYASSERT (i.exp() <= fq_nmod_ctx_degree(ctx), "convertFacCF2Fq_nmod_t: element is not reduced");
-      nmod_poly_set_coeff_ui (result, i.exp(), c.intval());
-    }
-  }
+      nmod_poly_set_coeff_ui (res, i.exp(), c.intval());
+    }
+  }
+  fq_nmod_init(result,ctx);
+  fq_nmod_set_nmod_poly(result,res,ctx);
   if (save_sym_ff) On (SW_SYMMETRIC_FF);
 }
 
 CanonicalForm
-convertFq_nmod_t2FacCF (const fq_nmod_t poly, const Variable& alpha)
-{
-  return convertnmod_poly_t2FacCF (poly, alpha);
+convertFq_nmod_t2FacCF (const fq_nmod_t poly, const fq_nmod_ctx_t ctx, const Variable& alpha)
+{
+  nmod_poly_t p;
+  nmod_poly_init(p,getCharacteristic());
+  fq_nmod_get_nmod_poly(p,poly,ctx);
+  CanonicalForm res= convertnmod_poly_t2FacCF (p, alpha);
+  nmod_poly_clear(p);
+  return res;
 }
 
@@ -476 +506 @@
     if (fq_nmod_is_zero (coeff, ctx))
       continue;
-    result += convertFq_nmod_t2FacCF (coeff, alpha)*power (x, i);
+    result += convertFq_nmod_t2FacCF (coeff, alpha, ctx)*power (x, i);
     fq_nmod_zero (coeff, ctx);
   }
@@ -573 +603 @@
     {
       (*res)(i,j)=convertFq_nmod_t2FacCF (fq_nmod_mat_entry (m, i-1, j-1),
-                                          alpha);
+                                          alpha, fq_con);
     }
   }

factory/FLINTconvert.h

@@ -157 +157 @@
 CanonicalForm
 convertFq_nmod_t2FacCF (const fq_nmod_t poly, ///< [in] fq_nmod_t
-                        const Variable& alpha ///< [in] algebraic variable
+                        const Variable& alpha, ///< [in] algebraic variable
+                        const fq_nmod_ctx_t ctx ///<[in] context
                        );
 

factory/cf_map_ext.cc

@@ -90 +90 @@
     fq_nmod_neg(r0, r0, ctx);
     // convert
-    CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta);
+    CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta,ctx);
     // cleanup
     fq_nmod_poly_factor_clear(fac,ctx);
@@ -406 +406 @@
   fq_nmod_neg(r0, r0, ctx);
   // convert
-  CanonicalForm r1=convertFq_nmod_t2FacCF(r0,alpha);
+  CanonicalForm r1=convertFq_nmod_t2FacCF(r0,alpha,ctx);
   // cleanup
   fq_nmod_poly_factor_clear(fac,ctx);
@@ -469 +469 @@
     fq_nmod_neg(r0, r0, ctx);
     // convert
-    CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta);
+    CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta,ctx);
     // cleanup
     fq_nmod_poly_factor_clear(fac,ctx);
@@ -542 +542 @@
   fq_nmod_poly_get_coeff(r0,fac->poly+ind,0,ctx);
   fq_nmod_neg(r0,r0,ctx);
-  CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta);
+  CanonicalForm r1=convertFq_nmod_t2FacCF(r0,beta,ctx);
   // cleanup
   fq_nmod_poly_factor_clear(fac,ctx);

factory/facFqSquarefree.cc

@@ -106 +106 @@
 
     fq_nmod_pow (FLINTA, FLINTA, qp, fq_con);
-    A= convertFq_nmod_t2FacCF (FLINTA, alpha);
+    A= convertFq_nmod_t2FacCF (FLINTA, alpha, fq_con);
 
     fmpz_clear (qp);