Changeset 51aa162 in git

Timestamp:

Mar 5, 2012, 11:56:39 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2fbb9e6eb79d5cf73b07f1b64fb533282be9a0e2

Parents:

69fdf90b08eb79adafd1cd78ccee33b8748b3c85

git-author:

Martin Lee <martinlee84@web.de>2012-03-05 23:56:39+01:00

git-committer:

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

Message:

chg: do not compute p^k in FLINT

File:

• factory/facMul.cc (modified) (6 diffs)

factory/facMul.cc

@@ -422 +422 @@
       {
         fmpz_t FLINTpk;
-        fmpz_init_set_ui (FLINTpk, b.getp());
-        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_init (FLINTpk);
+        convertCF2Fmpz (FLINTpk, b.getpk());
         fmpz_mod_poly_t FLINTF, FLINTG;
         convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
@@ -431 +431 @@
         fmpz_mod_poly_clear (FLINTG);
         fmpz_mod_poly_clear (FLINTF);
+        fmpz_clear (FLINTpk);
         return result;
       }
@@ -544 +545 @@
       {
         fmpz_t FLINTpk;
-        fmpz_init_set_ui (FLINTpk, b.getp());
-        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_init (FLINTpk);
+        convertCF2Fmpz (FLINTpk, b.getpk());
         fmpz_mod_poly_t FLINTF, FLINTG;
         convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
@@ -553 +554 @@
         fmpz_mod_poly_clear (FLINTG);
         fmpz_mod_poly_clear (FLINTF);
+        fmpz_clear (FLINTpk);
         return result;
       }
@@ -686 +688 @@
       {
         fmpz_t FLINTpk;
-        fmpz_init_set_ui (FLINTpk, b.getp());
-        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_init (FLINTpk);
+        convertCF2Fmpz (FLINTpk, b.getpk());
         fmpz_mod_poly_t FLINTF, FLINTG;
         convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
@@ -695 +697 @@
         fmpz_mod_poly_clear (FLINTG);
         fmpz_mod_poly_clear (FLINTF);
+        fmpz_clear (FLINTpk);
         return result;
       }