Changeset 9c98c2 in git

Timestamp:

Feb 17, 2012, 11:12:16 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

e785e9081044da918572223fdfab379044387182

Parents:

c2aeb9aa4f5b5bc845c3d83ce3c7ab67db049358

git-author:

Martin Lee <martinlee84@web.de>2012-02-17 11:12:16+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:26+02:00

Message:

chg: added conversion for univariate polys over Z/p for non word size p

Location:

factory

Files:

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

factory/FLINTconvert.cc

@@ -16 +16 @@
 
 #include "canonicalform.h"
+#include "fac_util.h"
 #include "cf_iter.h"
 #include "cf_factory.h"
@@ -35 +36 @@
 #include <fmpq.h>
 #include <fmpz_poly.h>
+#include <fmpz_mod_poly.h>
 #include <nmod_poly.h>
 #include <fmpq_poly.h>
@@ -270 +272 @@
 }
 
-#endif
-
-
+void
+convertFacCF2Fmpz_mod_poly_t (fmpz_mod_poly_t result, const CanonicalForm& f,
+                              const fmpz_t p)
+{
+  fmpz_mod_poly_init2 (result, p, degree (f) + 1);
+  fmpz_poly_t buf;
+  convertFacCF2Fmpz_poly_t (buf, f);
+  fmpz_mod_poly_set_fmpz_poly (result, buf);
+  fmpz_poly_clear (buf);
+}
+
+CanonicalForm
+convertFmpz_mod_poly_t2FacCF (fmpz_mod_poly_t poly, const Variable& x,
+                              const modpk& b)
+{
+  fmpz_poly_t buf;
+  fmpz_poly_init (buf);
+  fmpz_mod_poly_get_fmpz_poly (buf, poly);
+  CanonicalForm result= convertFmpz_poly_t2FacCF (buf, x);
+  fmpz_poly_clear (buf);
+  return b (result);
+}
+
+#endif
+
+

factory/FLINTconvert.h

@@ -17 +17 @@
 #include <config.h>
 #include "canonicalform.h"
+#include "fac_util.h"
 
 #ifdef HAVE_FLINT
@@ -26 +27 @@
 #include <fmpq.h>
 #include <fmpz_poly.h>
+#include <fmpz_mod_poly.h>
 #include <fmpq_poly.h>
 #include <nmod_poly.h>
@@ -104 +106 @@
                                         );
 
+/// conversion of a factory univariate poly over Z to a FLINT poly over
+/// Z/p (for non word size p)
+void
+convertFacCF2Fmpz_mod_poly_t (
+                          fmpz_mod_poly_t result, ///< [in,out] fmpz_mod_poly_t
+                          const CanonicalForm& f, ///< [in] univariate poly over
+                                                  ///< Z
+                          const fmpz_t p          ///< [in] some integer p
+                             );
+
+/// conversion of a FLINT poly over Z/p (for non word size p) to a CanonicalForm
+/// over Z
+CanonicalForm
+convertFmpz_mod_poly_t2FacCF (
+                          fmpz_mod_poly_t poly, ///< [in] fmpz_mod_poly_t
+                          const Variable& x,    ///< [in] variable the result
+                                                ///< should have
+                          const modpk& b        ///< [in] coeff bound to map
+                                                ///< coeffs in (-p/2,p/2)
+                             );
+
 #endif
 #endif