1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): add two new constants BigDecimal::INFINITY and BigDecimal::NAN.

* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath.exp): modify the behaviors for infinity arguments as same as Math.exp.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2010-07-03 07:47:00 +00:00
parent 59cad45f99
commit 1c3e07f0d6
5 changed files with 43 additions and 3 deletions

View file

@ -1,4 +1,12 @@
Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com> Sat Jul 3 16:14:10 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): add two new constants
BigDecimal::INFINITY and BigDecimal::NAN.
* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath.exp): modify the
behaviors for infinity arguments as same as Math.exp.
Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar): * ext/psych/lib/psych/visitors/to_ruby.rb(visit_Psych_Nodes_Scalar):
teaching Psych to deserialize DateTime objects. [Bug #1390] teaching Psych to deserialize DateTime objects. [Bug #1390]
@ -11,7 +19,7 @@ Sat Jul 3 09:47:26 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* test/psych/test_date_time.rb: tests for dumping DateTime objects. * test/psych/test_date_time.rb: tests for dumping DateTime objects.
Sat Jul 3 09:13:55 2010 Aaron Patterson <aaron@tenderlovemaking.com> Sat Jul 3 09:13:55 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_Time): use
Time#nsec to accurately serialize time objects. [ruby-core:29233] Time#nsec to accurately serialize time objects. [ruby-core:29233]

View file

@ -1902,6 +1902,8 @@ BigDecimal_sign(VALUE self)
void void
Init_bigdecimal(void) Init_bigdecimal(void)
{ {
VALUE arg;
/* Initialize VP routines */ /* Initialize VP routines */
VpInit((U_LONG)0); VpInit((U_LONG)0);
@ -2023,6 +2025,12 @@ Init_bigdecimal(void)
/* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */ /* -3: Indicates that a value is negative and infinite. See BigDecimal.sign. */
rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE)); rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
arg = rb_str_new2("+Infinity");
rb_define_const(rb_cBigDecimal, "INFINITY", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
arg = rb_str_new2("NaN");
rb_define_const(rb_cBigDecimal, "NAN", BigDecimal_global_new(1, &arg, rb_cBigDecimal));
/* instance methods */ /* instance methods */
rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0); rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);

View file

@ -155,7 +155,15 @@ module BigMath
# -> "0.271828182845904523536028752390026306410273E1" # -> "0.271828182845904523536028752390026306410273E1"
def exp(x, prec) def exp(x, prec)
raise ArgumentError, "Zero or negative precision for exp" if prec <= 0 raise ArgumentError, "Zero or negative precision for exp" if prec <= 0
return BigDecimal("NaN") if x.infinite? || x.nan? if x.infinite?
if x < 0
return BigDecimal("0", prec)
else
return BigDecimal("+Infinity", prec)
end
elsif x.nan?
return BigDecimal("NaN", prec)
end
n = prec + BigDecimal.double_fig n = prec + BigDecimal.double_fig
one = BigDecimal("1") one = BigDecimal("1")
x = -x if neg = x < 0 x = -x if neg = x < 0

View file

@ -709,4 +709,12 @@ class TestBigDecimal < Test::Unit::TestCase
ensure ensure
GC.stress = stress GC.stress = stress
end end
def test_INFINITY
assert(BigDecimal::INFINITY.infinite?, "BigDecimal::INFINITY is not a infinity")
end
def test_NAN
assert(BigDecimal::NAN.nan?, "BigDecimal::NAN is not NaN")
end
end end

View file

@ -67,6 +67,14 @@ class TestBigMath < Test::Unit::TestCase
assert_in_epsilon(Math.exp(40), exp(BigDecimal("40"), N)) assert_in_epsilon(Math.exp(40), exp(BigDecimal("40"), N))
assert_in_epsilon(Math.exp(-N), exp(BigDecimal("-20"), N)) assert_in_epsilon(Math.exp(-N), exp(BigDecimal("-20"), N))
assert_in_epsilon(Math.exp(-40), exp(BigDecimal("-40"), N)) assert_in_epsilon(Math.exp(-40), exp(BigDecimal("-40"), N))
begin
old_mode = BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY)
BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, false)
assert(exp(BigDecimal::INFINITY, N).infinite?, "exp(INFINITY) is not an infinity")
ensure
#BigDecimal.mode(BigDecimal::EXCEPTION_INFINITY, old_mode)
end
assert_equal(0.0, exp(-BigDecimal::INFINITY, N))
end end
def test_log def test_log