Changeset 26fc59 in git

Timestamp:

Jun 24, 2013, 4:33:12 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

47310215b203f48bdcb8ddd5548d21c99d84717a

Parents:

13a03bf0c76a48e756ec7fbd4e7c57a45432e301

git-author:

Martin Lee <martinlee84@web.de>2013-06-24 16:33:12+02:00

git-committer:

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

Message:

chg: got rid of Farey in chinrem_gcd

File:

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

factory/cf_gcd.cc

@@ -480 +480 @@
 //
 //}}}
+
 static CanonicalForm
-balance_p ( const CanonicalForm & f, const CanonicalForm & q )
+balance_p ( const CanonicalForm & f, const CanonicalForm & q, const CanonicalForm & qh )
 {
     Variable x = f.mvar();
-    CanonicalForm result = 0, qh = q / 2;
+    CanonicalForm result = 0;
     CanonicalForm c;
     CFIterator i;
@@ -498 +499 @@
         }
         else
-          result += power( x, i.exp() ) * balance_p(c,q);
+          result += power( x, i.exp() ) * balance_p(c,q,qh);
     }
     return result;
+}
+
+static CanonicalForm
+balance_p ( const CanonicalForm & f, const CanonicalForm & q )
+{
+    CanonicalForm qh = q / 2;
+    return balance_p (f, q, qh);
 }
 
@@ -1269 +1277 @@
 TIMING_DEFINE_PRINT(chinrem_termination)
 TIMING_DEFINE_PRINT(chinrem_recursion)
-TIMING_DEFINE_PRINT(chinrem_reconstruction)
 
 CanonicalForm chinrem_gcd ( const CanonicalForm & FF, const CanonicalForm & GG )
 {
-  CanonicalForm f, g, cl, q(0), Dp, newD, D, newq;
+  CanonicalForm f, g, cl, q(0), Dp, newD, D, newq, newqh;
   int p, i, dp_deg, d_deg=-1;
 
@@ -1293 +1300 @@
 
   CanonicalForm Dn, test= 0;
+  CanonicalForm lcf, lcg;
+  lcf= f.lc();
+  lcg= g.lc();
   cl =  gcd (f.lc(),g.lc());
   CanonicalForm gcdcfcg= gcd (cf, cg);
@@ -1322 +1332 @@
   i = cf_getNumBigPrimes() - 1;
 
-  CanonicalForm cof, cog, cofp, cogp, newCof, newCog, cofn, cogn;
+  CanonicalForm cof, cog, cofp, cogp, newCof, newCog, cofn, cogn, cDn;
   int maxNumVars= tmax (getNumVars (f), getNumVars (g));
   //Off (SW_RATIONAL);
@@ -1356 +1366 @@
                           "time for gcd mod p in modular gcd: ");
     Dp /=Dp.lc();
+    Dp *= mapinto (cl);
     cofp /= lc (cofp);
+    cofp *= mapinto (lcf);
     cogp /= lc (cogp);
+    cogp *= mapinto (lcg);
     setCharacteristic( 0 );
     dp_deg=totaldegree(Dp);
@@ -1372 +1385 @@
       d_deg=dp_deg;
       q = p;
+      Dn= balance_p (D, p);
+      cofn= balance_p (cof, p);
+      cogn= balance_p (cog, p);
     }
     else
@@ -1382 +1398 @@
         cof= newCof;
         cog= newCog;
+        newqh= newq/2;
+        Dn= balance_p (newD, newq, newqh);
+        cofn= balance_p (newCof, newq, newqh);
+        cogn= balance_p (newCog, newq, newqh);
+        if (test != Dn) //balance_p (newD, newq))
+          test= balance_p (newD, newq);
+        else
+          equal= true;
         q = newq;
         D = newD;
@@ -1396 +1420 @@
         test= 0;
         equal= false;
+        Dn= balance_p (D, p);
+        cofn= balance_p (cof, p);
+        cogn= balance_p (cog, p);
       }
       else
@@ -1405 +1432 @@
     if ( i >= 0 )
     {
-      TIMING_START (chinrem_reconstruction);
-      Dn= Farey(D,q);
-      cofn= Farey(cof,q);
-      cogn= Farey(cog,q);
-      TIMING_END_AND_PRINT (chinrem_reconstruction,
-                           "time for rational reconstruction in modular gcd: ");
-      int is_rat= isOn (SW_RATIONAL);
-      On (SW_RATIONAL);
-      cd = bCommonDen( Dn ); // we need On(SW_RATIONAL)
-      cofn *= bCommonDen (cofn);
-      cogn *= bCommonDen (cogn);
-      if (!is_rat)
-        Off (SW_RATIONAL);
-      Dn *=cd;
-      if (test != Dn)
-        test= Dn;
-      else
-        equal= true;
-      //Dn /=vcontent(Dn,Variable(1));
+      cDn= icontent (Dn);
+      Dn /= cDn;
+      cofn /= cl/cDn;
+      //cofn /= icontent (cofn);
+      cogn /= cl/cDn;
+      //cogn /= icontent (cogn);
       TIMING_START (chinrem_termination);
       if ((terminationTest (f,g, cofn, cogn, Dn)) ||