diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-13 13:51:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-13 13:51:53 +0000 |
commit | b359d20352163558d4e7550714844f24b568297e (patch) | |
tree | b5932236ea53fb4dc0e1ec1c283566157170c263 /test | |
parent | c25853518665c71a79704ca50d40bf2fc4bc6aaa (diff) | |
download | ruby-b359d20352163558d4e7550714844f24b568297e.tar.gz |
* array.c (rb_ary_sum): Array#sum is implemented.
Kahan's compensated summation algorithm for precise sum of float
numbers is moved from ary_inject_op in enum.c.
* enum.c (ary_inject_op): Don't specialize for float numbers.
[ruby-core:74569] [Feature#12217] proposed by mrkn.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_array.rb | 34 | ||||
-rw-r--r-- | test/ruby/test_enum.rb | 7 |
2 files changed, 34 insertions, 7 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index fa158185f8..1881b86694 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1,6 +1,7 @@ # coding: US-ASCII # frozen_string_literal: false require 'test/unit' +require "rbconfig/sizeof" class TestArray < Test::Unit::TestCase def setup @@ -2710,6 +2711,39 @@ class TestArray < Test::Unit::TestCase assert_raise(TypeError) {h.dig(1, 0)} end + FIXNUM_MIN = -(1 << (8 * RbConfig::SIZEOF['long'] - 2)) + FIXNUM_MAX = (1 << (8 * RbConfig::SIZEOF['long'] - 2)) - 1 + + def assert_float_equal(e, v, msg=nil) + assert_equal(Float, v.class, msg) + assert_equal(e, v, msg) + end + + def test_sum + assert_equal(0, [].sum) + assert_equal(3, [3].sum) + assert_equal(8, [3, 5].sum) + assert_equal(15, [3, 5, 7].sum) + assert_float_equal(15.0, [3, 5, 7.0].sum) + assert_equal(2*FIXNUM_MAX, Array.new(2, FIXNUM_MAX).sum) + assert_equal(2*(FIXNUM_MAX+1), Array.new(2, FIXNUM_MAX+1).sum) + assert_equal(10*FIXNUM_MAX, Array.new(10, FIXNUM_MAX).sum) + assert_equal(0, ([FIXNUM_MAX, 1, -FIXNUM_MAX, -1]*10).sum) + assert_equal(FIXNUM_MAX*10, ([FIXNUM_MAX+1, -1]*10).sum) + assert_equal(2*FIXNUM_MIN, Array.new(2, FIXNUM_MIN).sum) + assert_equal((FIXNUM_MAX+1).to_f, [FIXNUM_MAX, 1, 0.0].sum) + assert_float_equal(8.0, [3.0, 5].sum) + assert_float_equal((FIXNUM_MAX+1).to_f, [0.0, FIXNUM_MAX+1].sum) + assert_equal(2.0+3.0i, [2.0, 3.0i].sum) + + large_number = 100000000 + small_number = 1e-9 + until (large_number + small_number) == large_number + small_number /= 10 + end + assert_equal(large_number+(small_number*10), [large_number, *[small_number]*10].sum) + end + private def need_continuation unless respond_to?(:callcc, true) diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index ba973e2d48..97730f919f 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -217,13 +217,6 @@ class TestEnumerable < Test::Unit::TestCase assert_float_equal(10.0, [3.0, 5].inject(2.0, :+)) assert_float_equal((FIXNUM_MAX+1).to_f, [0.0, FIXNUM_MAX+1].inject(:+)) assert_equal(2.0+3.0i, [2.0, 3.0i].inject(:+)) - - large_number = 100000000 - small_number = 1e-9 - until (large_number + small_number) == large_number - small_number /= 10 - end - assert_equal(large_number+(small_number*10), [large_number, *[small_number]*10].inject(:+)) end def test_inject_array_plus_redefined |