Changeset 65148c4 in git for factory/cf_gcd.cc

Timestamp:

Feb 18, 2013, 5:54:37 PM (11 years ago)

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

77ed18101c07cdbb767d8703e5ea1d0f7c8b05f6

Parents:

71a4d7b8fea297969227779896a8ec8fc63aaedaa1da6f6fa3cfce502fec23270a8a572c1290577d

Message:

Merge pull request #265 from mohamed-barakat/spielwiese

clang fixes

File:

• factory/cf_gcd.cc (modified) (5 diffs)

factory/cf_gcd.cc

@@ -607 +607 @@
 gcd_poly_p( const CanonicalForm & f, const CanonicalForm & g )
 {
+    if (f.inCoeffDomain() || g.inCoeffDomain()) //zero case should be caught by gcd
+      return 1;
     CanonicalForm pi, pi1;
     CanonicalForm C, Ci, Ci1, Hi, bi, pi2;
-    bool bpure;
+    bool bpure, ezgcdon= isOn (SW_USE_EZGCD_P);
     int delta = degree( f ) - degree( g );
 
@@ -620 +622 @@
         pi = g; pi1 = f; delta = -delta;
     }
-    Ci = content( pi ); Ci1 = content( pi1 );
-    pi1 = pi1 / Ci1; pi = pi / Ci;
+    if (pi.isUnivariate())
+      Ci= 1;
+    else
+    {
+      if (!ezgcdon)
+        On (SW_USE_EZGCD_P);
+      Ci = content( pi );
+      if (!ezgcdon)
+        Off (SW_USE_EZGCD_P);
+      pi = pi / Ci;
+    }
+    if (pi1.isUnivariate())
+      Ci1= 1;
+    else
+    {
+      if (!ezgcdon)
+        On (SW_USE_EZGCD_P);
+      Ci1 = content( pi1 );
+      if (!ezgcdon)
+        Off (SW_USE_EZGCD_P);
+      pi1 = pi1 / Ci1;
+    }
     C = gcd( Ci, Ci1 );
     int d= 0;
@@ -683 +705 @@
         pi = pi1; pi1 = pi2;
         maxNumVars= tmax (getNumVars (pi), getNumVars (pi1));
-        if (!(pi1.isUnivariate()) && (size (pi1)/maxNumVars > 500))
+        if (!pi1.isUnivariate() && (size (pi1)/maxNumVars > 500))
         {
             On (SW_USE_FF_MOD_GCD);
@@ -701 +723 @@
             if (!(pi.isUnivariate() && pi1.isUnivariate()))
             {
-              if (size (Hi)*size (pi)/(maxNumVars*3) > 500) //maybe this needs more tuning
+              if (size (Hi)*size (pi)/(maxNumVars*3) > 1500) //maybe this needs more tuning
               {
                 On (SW_USE_FF_MOD_GCD);
@@ -717 +739 @@
       return C;
     }
-    pi /= content( pi );
+    if (!pi.isUnivariate())
+    {
+      if (!ezgcdon)
+        On (SW_USE_EZGCD_P);
+      Ci= gcd (LC (oldPi,v), LC (oldPi1,v));
+      pi /= LC (pi,v)/Ci;
+      Ci= content (pi);
+      pi /= Ci;
+      if (!ezgcdon)
+        Off (SW_USE_EZGCD_P);
+    }
     if ( bpure )
         pi /= pi.lc();