summaryrefslogtreecommitdiff
path: root/numeric.c
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-05 21:44:42 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-05 21:44:42 +0000
commit3dc28710c98502db74dc103bcdc58b65564e83ab (patch)
tree2957f13c6fccd5513f175867e9d74fd85d9a487e /numeric.c
parent73bb2a29f9b345785af7d456135e8ecd7e13a174 (diff)
* numeric.c (flo_round): Fix criteria for 32 bits platform
part 2 of [bug #5276] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r--numeric.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/numeric.c b/numeric.c
index d3977e44ee..87afe14662 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1560,16 +1560,16 @@ flo_round(int argc, VALUE *argv, VALUE num)
10 ** ((binexp-1)/log_2(10)) <= |number| < 10 ** (binexp/log_2(10))
If binexp >= 0, and since log_2(10) = 3.322259:
10 ** (binexp/4 - 1) < |number| < 10 ** (binexp/3)
- binexp/4 <= exp <= binexp/3
+ floor(binexp/4) <= exp <= ceil(binexp/3)
If binexp <= 0, swap the /4 and the /3
- So if ndigits + binexp/(4 or 3) >= float_dig, the result is number
- If ndigits + binexp/(3 or 4) < 0 the result is 0
+ So if ndigits + floor(binexp/(4 or 3)) >= float_dig, the result is number
+ If ndigits + ceil(binexp/(3 or 4)) < 0 the result is 0
*/
if (isinf(number) || isnan(number) ||
- (((long)ndigits - float_dig) * (3 + (binexp > 0)) + binexp >= 0)) {
+ (ndigits >= float_dig - (binexp > 0 ? binexp / 4 : binexp / 3 - 1))) {
return num;
}
- if ((long)ndigits * (4 - (binexp > 0)) + binexp < 0) {
+ if (ndigits < - (binexp > 0 ? binexp / 3 + 1 : binexp / 4)) {
return DBL2NUM(0);
}
f = pow(10, ndigits);