Changeset e380c09 in git

Timestamp:

Jul 19, 2013, 5:18:33 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

5e03fb4e472ba218e89b7a882ab8398f47f1d5ad

Parents:

47310215b203f48bdcb8ddd5548d21c99d84717a

git-author:

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

git-committer:

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

Message:

chg: earlier switching to dense gcd

Location:

factory

Files:

• cf_gcd_smallp.cc (modified) (2 diffs)
• fac_ezgcd.cc (modified) (2 diffs)

factory/cf_gcd_smallp.cc

@@ -4243 +4243 @@
   if (FF == GG) return FF/Lc(FF);
 
+  int maxNumVars= tmax (getNumVars (FF), getNumVars (GG));
+  Variable a, oldA;
+  int sizeF= size (FF);
+  int sizeG= size (GG);
+
+  if (sizeF/maxNumVars > sizePerVars1 && sizeG/maxNumVars > sizePerVars1)
+  {
+    if (hasFirstAlgVar (FF, a) || hasFirstAlgVar (GG, a))
+      return GCD_Fp_extension (FF, GG, a);
+    else if (CFFactory::gettype() == GaloisFieldDomain)
+      return GCD_GF (FF, GG);
+    else
+      return GCD_small_p (FF, GG);
+  }
+
   CanonicalForm F, G, f, g, d, Fb, Gb, Db, Fbt, Gbt, Dbt, B0, B, D0, lcF, lcG,
                 lcD;
@@ -4294 +4309 @@
   }
 
-  int maxNumVars= tmax (getNumVars (F), getNumVars (G));
-  Variable a, oldA;
-  int sizeF= size (F);
-  int sizeG= size (G);
+  maxNumVars= tmax (getNumVars (F), getNumVars (G));
+  sizeF= size (F);
+  sizeG= size (G);
 
   if (sizeF/maxNumVars > sizePerVars1 && sizeG/maxNumVars > sizePerVars1)

factory/fac_ezgcd.cc

@@ -432 +432 @@
 {
   bool isRat= isOn (SW_RATIONAL);
+
+  int maxNumVars= tmax (getNumVars (FF), getNumVars (GG));
+  int sizeF= size (FF);
+  int sizeG= size (GG);
+
+
+  if (!isRat)
+    On (SW_RATIONAL);
+  if (sizeF/maxNumVars > 500 && sizeG/maxNumVars > 500)
+  {
+    Off(SW_USE_EZGCD);
+    CanonicalForm result=gcd( FF, GG );
+    On(SW_USE_EZGCD);
+    if (!isRat)
+      Off (SW_RATIONAL);
+    result /= icontent (result);
+    DEBDECLEVEL( cerr, "ezgcd" );
+    return result;
+  }
+
+
   CanonicalForm F, G, f, g, d, Fb, Gb, Db, Fbt, Gbt, Dbt, B0, B, D0, lcF, lcG,
                 lcD, cand, contcand, result;
@@ -497 +518 @@
   }
 
-  int maxNumVars= tmax (getNumVars (F), getNumVars (G));
-  int sizeF= size (F);
-  int sizeG= size (G);
-
+  maxNumVars= tmax (getNumVars (F), getNumVars (G));
+  sizeF= size (F);
+  sizeG= size (G);
 
   if (!isRat)