Changeset 6bbe94 in git
 Timestamp:
 Oct 17, 2012, 10:28:23 AM (11 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
 Children:
 1bc7201c1a771fb5cc842ca4f475ba3ea91e6979
 Parents:
 85ea066b03d85152b63440f23f61f3309bf66ef8
 gitauthor:
 Martin Lee <martinlee84@web.de>20121017 10:28:23+02:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20121017 17:11:51+02:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/algext.cc
r85ea06 r6bbe94 548 548 return; 549 549 m *= (x  alpha); 550 if( gnew == gm) // gnew did not change551 { 552 cf = tryvcontent(g m, Variable(2), M, fail);550 if((firstLC(gnew) == gamma)  (gnew == gm)) // gnew did not change 551 { 552 cf = tryvcontent(gnew, Variable(2), M, fail); 553 553 if(fail) 554 554 return; 555 555 divides = true; 556 g_image= g m;556 g_image= gnew; 557 557 g_image.tryDiv (cf, M, fail); 558 558 if(fail) … … 692 692 } 693 693 // here: a is the biggest alg. var in f and g AND some of f,g is in extension 694 // (in the sequel b is used to swap alg/poly vars)695 694 setReduce(a,false); // do not reduce expressions modulo mipo 696 695 tmp = getMipo(a); … … 703 702 mv = i; 704 703 // here: mv is level of the largest variable in f, g 705 b = Variable(mv+1);706 704 bound = new int[mv+1]; // 'bound' could be indexed from 0 to mv, but we will only use from 1 to mv 707 705 other = new int[mv+1]; … … 750 748 if(isEqual(bound, other, 1, mv)) // equal 751 749 { 752 chineseRemainder( D, q, replacevar( mapinto(Dp), a, b), p, tmp, newq );750 chineseRemainder( D, q, mapinto(Dp), p, tmp, newq ); 753 751 // tmp = Dp mod p 754 752 // tmp = D mod q … … 758 756 D = tmp; 759 757 On( SW_RATIONAL ); 760 tmp = replacevar( Farey( D, q ), b, a ); // Farey and switch back to alg var 758 tmp = Farey( D, q ); // Farey 759 tmp *= bCommonDen (tmp); 761 760 setReduce(a,true); // reduce expressions modulo mipo 762 761 On( SW_RATIONAL ); // needed by fdivides … … 780 779 // here: isLess(other, bound, 1, mv) ) ==> all previous primes unlucky 781 780 q = p; 782 D = replacevar( mapinto(Dp), a, b); // shortcut CRA // shortcut CRA781 D = mapinto(Dp); // shortcut CRA // shortcut CRA 783 782 for(int i=1; i<=mv; i++) // tighten bound 784 783 bound[i] = other[i];
Note: See TracChangeset
for help on using the changeset viewer.