Changeset 6bbe94 in git

Timestamp:

Oct 17, 2012, 10:28:23 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1bc7201c1a771fb5cc842ca4f475ba3ea91e6979

Parents:

85ea066b03d85152b63440f23f61f3309bf66ef8

git-author:

Martin Lee <martinlee84@web.de>2012-10-17 10:28:23+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-17 17:11:51+02:00

Message:

chg: earlier divisibility testing in tryBrownGCD
chg: no replacing of alg. variable due to changed rational reconstruction

File:

• factory/algext.cc (modified) (6 diffs)

factory/algext.cc

@@ -548 +548 @@
         return;
       m *= (x - alpha);
-      if(gnew == gm) // gnew did not change
-      {
-        cf = tryvcontent(gm, Variable(2), M, fail);
+      if((firstLC(gnew) == gamma) || (gnew == gm)) // gnew did not change
+      {
+        cf = tryvcontent(gnew, Variable(2), M, fail);
         if(fail)
           return;
         divides = true;
-        g_image= gm;
+        g_image= gnew;
         g_image.tryDiv (cf, M, fail);
         if(fail)
@@ -692 +692 @@
   }
   // here: a is the biggest alg. var in f and g AND some of f,g is in extension
-  // (in the sequel b is used to swap alg/poly vars)
   setReduce(a,false); // do not reduce expressions modulo mipo
   tmp = getMipo(a);
@@ -703 +702 @@
     mv = i;
   // here: mv is level of the largest variable in f, g
-  b = Variable(mv+1);
   bound = new int[mv+1]; // 'bound' could be indexed from 0 to mv, but we will only use from 1 to mv
   other = new int[mv+1];
@@ -750 +748 @@
     if(isEqual(bound, other, 1, mv)) // equal
     {
-      chineseRemainder( D, q, replacevar( mapinto(Dp), a, b ), p, tmp, newq );
+      chineseRemainder( D, q, mapinto(Dp), p, tmp, newq );
       // tmp = Dp mod p
       // tmp = D mod q
@@ -758 +756 @@
         D = tmp;
       On( SW_RATIONAL );
-      tmp = replacevar( Farey( D, q ), b, a ); // Farey and switch back to alg var
+      tmp = Farey( D, q ); // Farey
+      tmp *= bCommonDen (tmp);
       setReduce(a,true); // reduce expressions modulo mipo
       On( SW_RATIONAL ); // needed by fdivides
@@ -780 +779 @@
     // here: isLess(other, bound, 1, mv) ) ==> all previous primes unlucky
     q = p;
-    D = replacevar( mapinto(Dp), a, b ); // shortcut CRA // shortcut CRA
+    D = mapinto(Dp); // shortcut CRA // shortcut CRA
     for(int i=1; i<=mv; i++) // tighten bound
       bound[i] = other[i];