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/mathn.rb: Fix indentation. Patch by Jason Dew.

Browse source 
[Ruby 1.9 - Feature #4682]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2011-05-12 22:04:59 +00:00
parent 6e10135d47
commit 8c47d51883
2 changed files with 54 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri May 13 07:04:33 2011 Eric Hodel <drbrain@segment7.net>
* lib/mathn.rb: Fix indentation. Patch by Jason Dew.
[Ruby 1.9 - Feature #4682]
Fri May 13 06:50:43 2011 Eric Hodel <drbrain@segment7.net> Fri May 13 06:50:43 2011 Eric Hodel <drbrain@segment7.net>
* lib/mathn.rb: Add documentation. Patch by Jason Dew. [Ruby 1.9 - * lib/mathn.rb: Add documentation. Patch by Jason Dew. [Ruby 1.9 -

95
lib/mathn.rb
View file

@ -73,40 +73,43 @@ end
class Rational class Rational
remove_method :** remove_method :**
##
# exponentiate by +other+
def ** (other) def ** (other)
if other.kind_of?(Rational) if other.kind_of?(Rational)
other2 = other other2 = other
if self < 0 if self < 0
return Complex(self, 0.0) ** other return Complex(self, 0.0) ** other
elsif other == 0 elsif other == 0
return Rational(1,1) return Rational(1,1)
elsif self == 0 elsif self == 0
return Rational(0,1) return Rational(0,1)
elsif self == 1 elsif self == 1
return Rational(1,1) return Rational(1,1)
end end
npd = numerator.prime_division npd = numerator.prime_division
dpd = denominator.prime_division dpd = denominator.prime_division
if other < 0 if other < 0
other = -other other = -other
npd, dpd = dpd, npd npd, dpd = dpd, npd
end end
for elm in npd for elm in npd
elm[1] = elm[1] * other elm[1] = elm[1] * other
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1 if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
return Float(self) ** other2 return Float(self) ** other2
end end
elm[1] = elm[1].to_i elm[1] = elm[1].to_i
end end
for elm in dpd for elm in dpd
elm[1] = elm[1] * other elm[1] = elm[1] * other
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1 if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
return Float(self) ** other2 return Float(self) ** other2
end end
elm[1] = elm[1].to_i elm[1] = elm[1].to_i
end end
num = Integer.from_prime_division(npd) num = Integer.from_prime_division(npd)
@ -116,14 +119,14 @@ class Rational
elsif other.kind_of?(Integer) elsif other.kind_of?(Integer)
if other > 0 if other > 0
num = numerator ** other num = numerator ** other
den = denominator ** other den = denominator ** other
elsif other < 0 elsif other < 0
num = denominator ** -other num = denominator ** -other
den = numerator ** -other den = numerator ** -other
elsif other == 0 elsif other == 0
num = 1 num = 1
den = 1 den = 1
end end
Rational(num, den) Rational(num, den)
elsif other.kind_of?(Float) elsif other.kind_of?(Float)
@ -144,17 +147,17 @@ module Math
if a.kind_of?(Complex) if a.kind_of?(Complex)
abs = sqrt(a.real*a.real + a.imag*a.imag) abs = sqrt(a.real*a.real + a.imag*a.imag)
# if not abs.kind_of?(Rational) # if not abs.kind_of?(Rational)
# return a**Rational(1,2) # return a**Rational(1,2)
# end # end
x = sqrt((a.real + abs)/Rational(2)) x = sqrt((a.real + abs)/Rational(2))
y = sqrt((-a.real + abs)/Rational(2)) y = sqrt((-a.real + abs)/Rational(2))
# if !(x.kind_of?(Rational) and y.kind_of?(Rational)) # if !(x.kind_of?(Rational) and y.kind_of?(Rational))
# return a**Rational(1,2) # return a**Rational(1,2)
# end # end
if a.imag >= 0 if a.imag >= 0
Complex(x, y) Complex(x, y)
else else
Complex(x, -y) Complex(x, -y)
end end
elsif a.respond_to?(:nan?) and a.nan? elsif a.respond_to?(:nan?) and a.nan?
a a
@ -176,36 +179,36 @@ module Math
byte_a = [src & 0xffffffff] byte_a = [src & 0xffffffff]
# ruby's bug # ruby's bug
while (src >= max) and (src >>= 32) while (src >= max) and (src >>= 32)
byte_a.unshift src & 0xffffffff byte_a.unshift src & 0xffffffff
end end
answer = 0 answer = 0
main = 0 main = 0
side = 0 side = 0
for elm in byte_a for elm in byte_a
main = (main << 32) + elm main = (main << 32) + elm
side <<= 16 side <<= 16
if answer != 0 if answer != 0
if main * 4 < side * side if main * 4 < side * side
applo = main.div(side) applo = main.div(side)
else else
applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1 applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
end end
else else
applo = sqrt!(main).to_i + 1 applo = sqrt!(main).to_i + 1
end end
while (x = (side + applo) * applo) > main while (x = (side + applo) * applo) > main
applo -= 1 applo -= 1
end end
main -= x main -= x
answer = (answer << 16) + applo answer = (answer << 16) + applo
side += applo * 2 side += applo * 2
end end
if main == 0 if main == 0
answer answer
else else
sqrt!(a) sqrt!(a)
end end
end end
end end