1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (ruby_float_step): improve floating point calculations.

Browse Source 
[ruby-core:35753] [Bug #4576]

* numeric.c (ruby_float_step): correct the error of floating point
  numbers on the excluding case.
  patched by Masahiro Tanaka [ruby-core:39608]

* numeric.c (ruby_float_step): use the end value when the current
  value is greater than or equal to the end value.
  patched by Akira Tanaka [ruby-core:39612]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2011-10-05 07:35:27 +00:00
parent 6f8f555d2f
commit a635de7dcb
3 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Wed Sep 21 11:17:22 2011 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (ruby_float_step): improve floating point calculations.
[ruby-core:35753] [Bug #4576]
* numeric.c (ruby_float_step): correct the error of floating point
numbers on the excluding case.
patched by Masahiro Tanaka [ruby-core:39608]
* numeric.c (ruby_float_step): use the end value when the current
value is greater than or equal to the end value.
patched by Akira Tanaka [ruby-core:39612]
Wed Oct 5 05:56:39 2011 Eric Hodel <drbrain@segment7.net>
* hash.c (Init_Hash): Improve Hash documentation. Patch by Alvaro

23
numeric.c
View File

@ -1690,10 +1690,25 @@ ruby_float_step(VALUE from, VALUE to, VALUE step, int excl)
}
else {
if (err>0.5) err=0.5;
n = floor(n + err);
if (!excl || ((long)n)*unit+beg < end) n++;
for (i=0; i<n; i++) {
rb_yield(DBL2NUM(i*unit+beg));
if (excl) {
if (n>0) {
if (n<err)
n = 1;
else
n = floor(n - err) + 1;
}
} else {
n = floor(n + err) + 1;
}
if (end < (n-1)*unit+beg) {
for (i=0; i<n; i++) {
rb_yield(DBL2NUM((n-1-i)/(n-1)*beg+i/(n-1)*end));
}
}
else {
for (i=0; i<n; i++) {
rb_yield(DBL2NUM(i*unit+beg));
}
}
}
return TRUE;

31
test/ruby/test_float.rb
View File

@ -508,4 +508,35 @@ class TestFloat < Test::Unit::TestCase
sleep(0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1+0.1)
end
end
def test_step
1000.times do
a = rand
b = a+rand*1000
s = (b - a) / 10
assert_equal(11, (a..b).step(s).to_a.length)
end
assert_equal(11, (1.0..(1.0+1E-15)).step(1E-16).to_a.length)
(1.0..12.7).step(1.3).each do |n|
assert_operator(n, :<=, 12.7)
end
end
def test_step_excl
1000.times do
a = rand
b = a+rand*1000
s = (b - a) / 10
assert_equal(10, (a...b).step(s).to_a.length)
end
assert_equal([1.0, 2.9, 4.8, 6.699999999999999], (1.0...6.8).step(1.9).to_a)
e = 1+1E-12
(1.0 ... e).step(1E-16) do |n|
assert_operator(n, :<, e)
end
end
end