Changeset f9bd3d in git

Timestamp:

Feb 16, 2012, 5:14:39 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

d3d3168d8614852a68310698973f95ecc6a54139

Parents:

1ade963c1847f591acd6148d1fd1e76d97c688fd

git-author:

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

git-committer:

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

Message:

chg: use NTL for univariate operations with coeff bound

File:

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

factory/facMul.cc

@@ -407 +407 @@
     }
     else if (!F.inCoeffDomain() && !G.inCoeffDomain())
+    {
+      if (b.getp() != 0)
+        return b (mulFLINTQ (F, G));
       return mulFLINTQ (F, G);
+    }
 #endif
+    if (b.getp() != 0)
+      return b (F*G);
     return F*G;
   }
@@ -451 +457 @@
 {
   if (F.inCoeffDomain() && G.isUnivariate())
+  {
+    if (b.getp() != 0)
+      return b(F);
     return F;
+  }
   else if (F.inCoeffDomain() && G.inCoeffDomain())
+  {
+    if (b.getp() != 0)
+      return b(F%G);
     return mod (F, G);
+  }
   else if (F.isUnivariate() && G.inCoeffDomain())
+  {
+    if (b.getp() != 0)
+      return b(F%G);
     return mod (F,G);
+  }
 
   if (getCharacteristic() == 0)
@@ -462 +480 @@
     Variable alpha;
     if (!hasFirstAlgVar (F, alpha) && !hasFirstAlgVar (G, alpha))
+    {
+      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()));
+      }
       return modFLINTQ (F, G);
+    }
     else
     {
@@ -470 +501 @@
     }
 #else
+    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()));
+    }
     return mod (F, G);
 #endif
@@ -514 +556 @@
 {
   if (F.inCoeffDomain() && G.isUnivariate())
+  {
+    if (b.getp() != 0)
+      return b(F);
     return F;
+  }
   else if (F.inCoeffDomain() && G.inCoeffDomain())
+  {
+    if (b.getp() != 0)
+      return b(div (F,G));
     return div (F, G);
+  }
   else if (F.isUnivariate() && G.inCoeffDomain())
-    return div (F,G);
+  {
+    if (b.getp() != 0)
+      return b(div (F,G));
+    return div (F, G);
+  }
 
   if (getCharacteristic() == 0)
@@ -525 +579 @@
     Variable alpha;
     if (!hasFirstAlgVar (F, alpha) && !hasFirstAlgVar (G, alpha))
+    {
+      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()));
+      }
       return divFLINTQ (F,G);
+    }
     else
     {
@@ -533 +600 @@
     }
 #else
+    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()));
+    }
     return div (F, G);
 #endif