Changeset fd803bc in git
 Timestamp:
 Jul 14, 2011, 12:42:02 PM (12 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
 Children:
 3ec4fce5af220b0b3987bf0805e36d89d4c5d9d9
 Parents:
 58b1160c31f60cc5b14e49848a7528f1889a1ba5
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/facHensel.cc
r58b1160 rfd803bc 667 667 668 668 mul (F2, F2, G2); 669 F2 >>= k; 669 if (deg (F2) > k) 670 F2 >>= (k  d1); 670 671 671 672 return reverseSubst (F1, F2, d1, d2); … … 687 688 int d2= tmax (degree (A, 2), degree (B, 2)); 688 689 689 if (d1 > 128 && d2 > 160 && (degAy == degBy) )690 if (d1 > 128 && d2 > 160 && (degAy == degBy) && (2*degAy > degree (M))) 690 691 return mulMod2NTLFpReci (A, B, M); 691 692 … … 714 715 kronSubRecipro (G1, G2, G, d1, alpha); 715 716 716 int k 1= d1*degree (M);717 MulTrunc (F1, F1, G1, (long) k 1);717 int k= d1*degree (M); 718 MulTrunc (F1, F1, G1, (long) k); 718 719 719 720 mul (F2, F2, G2); 720 721 F2 >>= k1;721 if (deg (F2) > k) 722 F2 >>= (kd1); 722 723 723 724 CanonicalForm result= reverseSubst (F1, F2, d1, d2, alpha); … … 747 748 748 749 int degMipo= degree (getMipo (alpha)); 749 if ((d1 > 128/degMipo) && (d2 > 160/degMipo) && (degAy == degBy)) 750 if ((d1 > 128/degMipo) && (d2 > 160/degMipo) && (degAy == degBy) && 751 (2*degAy > degree (M))) 750 752 return mulMod2NTLFqReci (A, B, M, alpha); 751 753
Note: See TracChangeset
for help on using the changeset viewer.