diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-07-08 19:03:34 +0000 |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-07-08 19:03:34 +0000 |
| commit | e84b68d9d51dccad26e7e7dfa53439bcd14a0ffd (patch) | |
| tree | 914687e3bda753594c320ce8a34cd2d2dac1bfe3 /Lib | |
| parent | 4dee114c8ed083654049d6901f4ce132eb955ec0 (diff) | |
| download | cpython-e84b68d9d51dccad26e7e7dfa53439bcd14a0ffd.tar.gz | |
Fix a performance issue in Decimal.pow. Thanks Stefan Krah for finding this.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/decimal.py | 14 | ||||
| -rw-r--r-- | Lib/test/decimaltestdata/extra.decTest | 13 |
2 files changed, 21 insertions, 6 deletions
diff --git a/Lib/decimal.py b/Lib/decimal.py index 828027cd61..71408a8e9e 100644 --- a/Lib/decimal.py +++ b/Lib/decimal.py @@ -2047,12 +2047,14 @@ class Decimal(object): # case where xc == 1: result is 10**(xe*y), with xe*y # required to be an integer if xc == 1: - if ye >= 0: - exponent = xe*yc*10**ye - else: - exponent, remainder = divmod(xe*yc, 10**-ye) - if remainder: - return None + xe *= yc + # result is now 10**(xe * 10**ye); xe * 10**ye must be integral + while xe % 10 == 0: + xe //= 10 + ye += 1 + if ye < 0: + return None + exponent = xe * 10**ye if y.sign == 1: exponent = -exponent # if other is a nonnegative integer, use ideal exponent diff --git a/Lib/test/decimaltestdata/extra.decTest b/Lib/test/decimaltestdata/extra.decTest index 2640842c68..fce8435599 100644 --- a/Lib/test/decimaltestdata/extra.decTest +++ b/Lib/test/decimaltestdata/extra.decTest @@ -213,7 +213,20 @@ extr1658 shift 1234567 3 -> 7000 extr1659 shift 1234567 4 -> 0 extr1660 shift 1234567 5 -> NaN Invalid_operation +-- Cases where the power function was impossibly slow to determine that the +-- result is inexact. Thanks Stefan Krah for identifying this problem. +precision: 16 +maxExponent: 999999999 +minExponent: -999999999 +extr1700 power 10 1e-999999999 -> 1.000000000000000 Inexact Rounded +extr1701 power 100.0 -557.71e-742888888 -> 1.000000000000000 Inexact Rounded +extr1702 power 10 1e-100 -> 1.000000000000000 Inexact Rounded +-- A couple of interesting exact cases for power. Note that the specification +-- requires these to be reported as Inexact. +extr1710 power 1e375 56e-3 -> 1.000000000000000E+21 Inexact Rounded +extr1711 power 10000 0.75 -> 1000.000000000000 Inexact Rounded +extr1712 power 1e-24 0.875 -> 1.000000000000000E-21 Inexact Rounded -- Tests for the is_* boolean operations precision: 9 |