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

* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments

Browse source 
are passed. [ruby-core:66143] [Bug #10487]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gogotanaka 2015-02-24 23:53:21 +00:00
parent 0c4631b880
commit 0c3a0d6588
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 25 08:49:12 2015 Kazuki Tanaka <gogotanaka@ruby-lang.org>
* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments
are passed. [ruby-core:66143] [Bug #10487]
Tue Feb 25 02:15:17 2015 Kazuki Tanaka <gogotanaka@ruby-lang.org>
* test/ruby/test_math.rb: Use assert_infinity instead of assert_equal(1.0/0, ...).

17
lib/cmath.rb
View file

@ -66,20 +66,12 @@ module CMath
# it will be the base of logarithm.
#
# log(Complex(0,0)) #=> -Infinity+0.0i
def log(*args)
def log(z, b=::Math::E)
begin
z, b = args
unless b.nil? || b.kind_of?(Numeric)
raise TypeError, "Numeric Number required"
end
if z.real? and z >= 0 and (b.nil? or b >= 0)
log!(*args)
if z.real? && z >= 0 && b >= 0
log!(z, b)
else
a = Complex(log!(z.abs), z.arg)
if b
a /= log(b)
end
a
Complex(log!(z.abs), z.arg) / log(b)
end
rescue NoMethodError
handle_no_method_error
@ -397,4 +389,3 @@ module CMath
module_function :handle_no_method_error
end

6
test/ruby/test_complex.rb
View file

@ -950,9 +950,9 @@ class Complex_Test < Test::Unit::TestCase
assert_in_delta(0.804, c.real, 0.001)
assert_in_delta(1.107, c.imag, 0.001)
c = CMath.log(Complex(1, 2), Math::E)
assert_in_delta(0.804, c.real, 0.001)
assert_in_delta(1.107, c.imag, 0.001)
c = CMath.log(Complex(1, 2), Math::E**2)
assert_in_delta(0.402, c.real, 0.001)
assert_in_delta(0.5535, c.imag, 0.001)
c = CMath.log(-1)
assert_in_delta(0.0, c.real, 0.001)