Changeset 3e0c11d in git for factory

Timestamp:

Jul 19, 2013, 5:27:11 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

cd7ce9b4263a5891ddea76b64838ca31a35e2559

Parents:

f377d6d17c096643dc3242eba4b6200ae3630eb3

git-author:

Martin Lee <martinlee84@web.de>2013-07-19 17:27:11+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-07-22 15:49:54+02:00

Message:

chg: order of multiplicands if their sizes differ
chg: cut off for Karatsuba

File:

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

factory/facMul.cc

@@ -2130 +2130 @@
   CanonicalForm F= mod (A, M);
   CanonicalForm G= mod (B, M);
-  if (F.inCoeffDomain() || G.inCoeffDomain())
+  if (F.inCoeffDomain())
+    return G*F;
+  if (G.inCoeffDomain())
     return F*G;
+
   Variable y= M.mvar();
   int degF= degree (F, y);
@@ -2223 +2226 @@
   CanonicalForm F= mod (A, M);
   CanonicalForm G= mod (B, M);
-  if (F.inCoeffDomain() || G.inCoeffDomain())
+  if (F.inCoeffDomain())
+    return G*F;
+  if (G.inCoeffDomain())
     return F*G;
 
-  if (size (F) / MOD.length() < 100 || size (G) / MOD.length() < 100)
-    return mod (F*G, MOD);
+  int sizeF= size (F);
+  int sizeG= size (G);
+
+  if (sizeF / MOD.length() < 100 || sizeG / MOD.length() < 100)
+  {
+    if (sizeF < sizeG)
+      return mod (G*F, MOD);
+    else
+      return mod (F*G, MOD);
+  }
 
   Variable y= M.mvar();
@@ -2287 +2300 @@
   else
   {
-    m= (int) ceil (tmax (degF, degG)/2.0);
+    m= (int) ceil (tmin (degF, degG)/2.0);
     CanonicalForm yToM= power (y, m);
     CanonicalForm F0= mod (F, yToM);