Changeset e785e9 in git for factory/facMul.cc

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3f8663db4115fa2cabdf28fc5755f5b71aca1c8f

Parents:

9c98c2bf389aa260ab259cce1b827e8ee1bd9453

git-author:

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

git-committer:

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

Message:

chg: use FLINT for operations over Z/p (for non word size p)

File:

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

factory/facMul.cc

@@ -409 +409 @@
     {
       if (b.getp() != 0)
-        return b (mulFLINTQ (F, G));
+      {
+        fmpz_t FLINTpk;
+        fmpz_init_set_ui (FLINTpk, b.getp());
+        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_mod_poly_t FLINTF, FLINTG;
+        convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
+        convertFacCF2Fmpz_mod_poly_t (FLINTG, G, FLINTpk);
+        fmpz_mod_poly_mul (FLINTF, FLINTF, FLINTG);
+        CanonicalForm result= convertFmpz_mod_poly_t2FacCF (FLINTF, F.mvar(), b);
+        fmpz_mod_poly_clear (FLINTG);
+        fmpz_mod_poly_clear (FLINTF);
+        return result;
+      }
       return mulFLINTQ (F, G);
     }
@@ -483 +495 @@
       if (b.getp() != 0)
       {
-        ZZ NTLpk= power_ZZ (b.getp(), b.getk());
-        ZZ_p::init (NTLpk);
-        ZZX ZZf= convertFacCF2NTLZZX (F);
-        ZZX ZZg= convertFacCF2NTLZZX (G);
-        ZZ_pX NTLf= to_ZZ_pX (ZZf);
-        ZZ_pX NTLg= to_ZZ_pX (ZZg);
-        rem (NTLf, NTLf, NTLg);
-        return b (convertNTLZZX2CF (to_ZZX (NTLf), F.mvar()));
+        fmpz_t FLINTpk;
+        fmpz_init_set_ui (FLINTpk, b.getp());
+        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_mod_poly_t FLINTF, FLINTG;
+        convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
+        convertFacCF2Fmpz_mod_poly_t (FLINTG, G, FLINTpk);
+        fmpz_mod_poly_rem (FLINTF, FLINTF, FLINTG);
+        CanonicalForm result= convertFmpz_mod_poly_t2FacCF (FLINTF,F.mvar(),b);
+        fmpz_mod_poly_clear (FLINTG);
+        fmpz_mod_poly_clear (FLINTF);
+        return result;
       }
       return modFLINTQ (F, G);
@@ -582 +597 @@
       if (b.getp() != 0)
       {
-        ZZ NTLpk= power_ZZ (b.getp(), b.getk());
-        ZZ_p::init (NTLpk);
-        ZZX ZZf= convertFacCF2NTLZZX (F);
-        ZZX ZZg= convertFacCF2NTLZZX (G);
-        ZZ_pX NTLf= to_ZZ_pX (ZZf);
-        ZZ_pX NTLg= to_ZZ_pX (ZZg);
-        div (NTLf, NTLf, NTLg);
-        return b (convertNTLZZX2CF (to_ZZX (NTLf), F.mvar()));
+        fmpz_t FLINTpk;
+        fmpz_init_set_ui (FLINTpk, b.getp());
+        fmpz_pow_ui (FLINTpk, FLINTpk, b.getk());
+        fmpz_mod_poly_t FLINTF, FLINTG;
+        convertFacCF2Fmpz_mod_poly_t (FLINTF, F, FLINTpk);
+        convertFacCF2Fmpz_mod_poly_t (FLINTG, G, FLINTpk);
+        fmpz_mod_poly_divrem (FLINTF, FLINTG, FLINTF, FLINTG);
+        CanonicalForm result= convertFmpz_mod_poly_t2FacCF (FLINTF,F.mvar(),b);
+        fmpz_mod_poly_clear (FLINTG);
+        fmpz_mod_poly_clear (FLINTF);
+        return result;
       }
       return divFLINTQ (F,G);