Changeset 47dc5ea in git

Timestamp:

Mar 5, 2012, 10:09:04 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

69fdf90b08eb79adafd1cd78ccee33b8748b3c85

Parents:

c729f26220e3c5188b3151f01a80a302441e8dfd

git-author:

Martin Lee <martinlee84@web.de>2012-03-05 22:09:04+01:00

git-committer:

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

Message:

chg: *,/,% for univariate polys over Z_p^k[x]/(f) via NTL

File:

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

factory/facMul.cc

@@ -404 +404 @@
         (hasFirstAlgVar (F, alpha) || hasFirstAlgVar (G, alpha)))
     {
+      if (b.getp() != 0)
+      {
+        ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        ZZ_pE::init (NTLmipo);
+        ZZ_pEX NTLg= convertFacCF2NTLZZ_pEX (G, NTLmipo);
+        ZZ_pEX NTLf= convertFacCF2NTLZZ_pEX (F, NTLmipo);
+        mul (NTLf, NTLf, NTLg);
+        return b (convertNTLZZ_pEX2CF (NTLf, F.mvar(), alpha));
+      }
       CanonicalForm result= mulFLINTQa (F, G, alpha);
       return result;
@@ -427 +437 @@
 #endif
     if (b.getp() != 0)
+    {
+      if (!F.inBaseDomain() && !G.inBaseDomain())
+      {
+        if (hasFirstAlgVar (G, alpha) || hasFirstAlgVar (F, alpha))
+        {
+          ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+          if (F.inCoeffDomain() && !G.inCoeffDomain())
+          {
+            ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+            ZZ_pE::init (NTLmipo);
+            ZZ_pEX NTLg= convertFacCF2NTLZZ_pEX (G, NTLmipo);
+            ZZ_pX NTLf= convertFacCF2NTLZZpX (F);
+            mul (NTLg, to_ZZ_pE (NTLf), NTLg);
+            return b (convertNTLZZ_pEX2CF (NTLg, G.mvar(), alpha));
+          }
+          else if (!F.inCoeffDomain() && G.inCoeffDomain())
+          {
+            ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+            ZZ_pE::init (NTLmipo);
+            ZZ_pX NTLg= convertFacCF2NTLZZpX (G);
+            ZZ_pEX NTLf= convertFacCF2NTLZZ_pEX (F, NTLmipo);
+            mul (NTLf, NTLf, to_ZZ_pE (NTLg));
+            return b (convertNTLZZ_pEX2CF (NTLf, F.mvar(), alpha));
+          }
+          else
+          {
+            ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+            ZZ_pE::init (NTLmipo);
+            ZZ_pX NTLg= convertFacCF2NTLZZpX (G);
+            ZZ_pX NTLf= convertFacCF2NTLZZpX (F);
+            ZZ_pE result;
+            mul (result, to_ZZ_pE (NTLg), to_ZZ_pE (NTLf));
+            return b (convertNTLZZpX2CF (rep (result), alpha));
+          }
+        }
+      }
       return b (F*G);
+    }
     return F*G;
   }
@@ -512 +559 @@
     else
     {
+      if (b.getp() != 0)
+      {
+        ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        ZZ_pE::init (NTLmipo);
+        ZZ_pEX NTLg= convertFacCF2NTLZZ_pEX (G, NTLmipo);
+        ZZ_pEX NTLf= convertFacCF2NTLZZ_pEX (F, NTLmipo);
+        rem (NTLf, NTLf, NTLg);
+        return b (convertNTLZZ_pEX2CF (NTLf, F.mvar(), alpha));
+      }
       CanonicalForm Q, R;
       newtonDivrem (F, G, Q, R);
@@ -580 +637 @@
   {
     if (b.getp() != 0)
+    {
+      if (!F.inBaseDomain() || !G.inBaseDomain())
+      {
+        Variable alpha;
+        hasFirstAlgVar (F, alpha);
+        hasFirstAlgVar (G, alpha);
+        ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        ZZ_pE::init (NTLmipo);
+        ZZ_pX NTLg= convertFacCF2NTLZZpX (G);
+        ZZ_pX NTLf= convertFacCF2NTLZZpX (F);
+        ZZ_pE result;
+        div (result, to_ZZ_pE (NTLg), to_ZZ_pE (NTLf));
+        return b (convertNTLZZpX2CF (rep (result), alpha));
+      }
       return b(div (F,G));
+    }
     return div (F, G);
   }
@@ -586 +659 @@
   {
     if (b.getp() != 0)
+    {
+      if (!G.inBaseDomain())
+      {
+        Variable alpha;
+        hasFirstAlgVar (G, alpha);
+        ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        ZZ_pE::init (NTLmipo);
+        ZZ_pX NTLg= convertFacCF2NTLZZpX (G);
+        ZZ_pEX NTLf= convertFacCF2NTLZZ_pEX (F, NTLmipo);
+        div (NTLf, NTLf, to_ZZ_pE (NTLg));
+        return b (convertNTLZZ_pEX2CF (NTLf, F.mvar(), alpha));
+      }
       return b(div (F,G));
+    }
     return div (F, G);
   }
@@ -614 +701 @@
     else
     {
+      if (b.getp() != 0)
+      {
+        ZZ_p::init (convertFacCF2NTLZZ (b.getpk()));
+        ZZ_pX NTLmipo= to_ZZ_pX (convertFacCF2NTLZZX (getMipo (alpha)));
+        ZZ_pE::init (NTLmipo);
+        ZZ_pEX NTLg= convertFacCF2NTLZZ_pEX (G, NTLmipo);
+        ZZ_pEX NTLf= convertFacCF2NTLZZ_pEX (F, NTLmipo);
+        div (NTLf, NTLf, NTLg);
+        return b (convertNTLZZ_pEX2CF (NTLf, F.mvar(), alpha));
+      }
       CanonicalForm Q;
       newtonDiv (F, G, Q);