diff options
author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-26 11:14:40 +0000 |
---|---|---|
committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-26 11:14:40 +0000 |
commit | a90469602c82fe0fe607cc6f1c8f32b223db0394 (patch) | |
tree | f5e22a99f831016f4ea73911184a4dd57940978a /lib/cmath.rb | |
parent | 76b33197e245c5ad070a3da427f096a82fccf898 (diff) | |
download | ruby-a90469602c82fe0fe607cc6f1c8f32b223db0394.tar.gz |
* complex.c, rational.c, lib/cmath.rb, lib/date.rb lib/date/delta*:
reverted r27484-27486. now official spec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/cmath.rb')
-rw-r--r-- | lib/cmath.rb | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/lib/cmath.rb b/lib/cmath.rb index 36d0bdd008..b23dac239c 100644 --- a/lib/cmath.rb +++ b/lib/cmath.rb @@ -4,8 +4,10 @@ module CMath alias exp! exp alias log! log + alias log2! log2 alias log10! log10 alias sqrt! sqrt + alias cbrt! cbrt alias sin! sin alias cos! cos @@ -47,6 +49,14 @@ module CMath end end + def log2(z) + if z.real? and z >= 0 + log2!(z) + else + log(z) / log!(2) + end + end + def log10(z) if z.real? and z >= 0 log10!(z) @@ -74,6 +84,14 @@ module CMath end end + def cbrt(z) + if z.real? and z >= 0 + cbrt!(z) + else + Complex(z) ** (1.0/3) + end + end + def sin(z) if z.real? sin!(z) @@ -186,10 +204,14 @@ module CMath module_function :exp module_function :log! module_function :log + module_function :log2! + module_function :log2 module_function :log10! module_function :log10 module_function :sqrt! module_function :sqrt + module_function :cbrt! + module_function :cbrt module_function :sin! module_function :sin @@ -221,8 +243,6 @@ module CMath module_function :atanh! module_function :atanh - module_function :log2 - module_function :cbrt module_function :frexp module_function :ldexp module_function :hypot |