mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
313 lines
6.7 KiB
Ruby
313 lines
6.7 KiB
Ruby
#
|
|
# mathn.rb -
|
|
# $Release Version: 0.5 $
|
|
# $Revision: 1.1.1.1.4.1 $
|
|
# $Date: 1998/01/16 12:36:05 $
|
|
# by Keiju ISHITSUKA(SHL Japan Inc.)
|
|
#
|
|
# --
|
|
#
|
|
#
|
|
#
|
|
|
|
require "complex.rb"
|
|
require "rational.rb"
|
|
require "matrix.rb"
|
|
|
|
class Integer
|
|
|
|
def Integer.from_prime_division(pd)
|
|
value = 1
|
|
for prime, index in pd
|
|
value *= prime**index
|
|
end
|
|
value
|
|
end
|
|
|
|
def prime_division
|
|
ps = Prime.new
|
|
value = self
|
|
pv = []
|
|
for prime in ps
|
|
count = 0
|
|
while (value1, mod = value.divmod(prime)
|
|
mod) == 0
|
|
value = value1
|
|
count += 1
|
|
end
|
|
if count != 0
|
|
pv.push [prime, count]
|
|
end
|
|
break if prime * prime >= value
|
|
end
|
|
if value > 1
|
|
pv.push [value, 1]
|
|
end
|
|
return pv
|
|
end
|
|
end
|
|
|
|
class Prime
|
|
include Enumerable
|
|
# These are included as class variables to cache them for later uses. If memory
|
|
# usage is a problem, they can be put in Prime#initialize as instance variables.
|
|
|
|
# There must be no primes between @@primes[-1] and @@next_to_check.
|
|
@@primes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101]
|
|
# @@next_to_check % 6 must be 1.
|
|
@@next_to_check = 103 # @@primes[-1] - @@primes[-1] % 6 + 7
|
|
@@ulticheck_index = 3 # @@primes.index(@@primes.reverse.find {|n|
|
|
# n < Math.sqrt(@@next_to_check) })
|
|
@@ulticheck_next_squared = 121 # @@primes[@@ulticheck_index + 1] ** 2
|
|
|
|
class << self
|
|
# Return the prime cache.
|
|
def cache
|
|
return @@primes
|
|
end
|
|
alias primes cache
|
|
alias primes_so_far cache
|
|
end
|
|
|
|
def initialize
|
|
@index = -1
|
|
end
|
|
|
|
# Return primes given by this instance so far.
|
|
def primes
|
|
return @@primes[0, @index + 1]
|
|
end
|
|
alias primes_so_far primes
|
|
|
|
def succ
|
|
@index += 1
|
|
while @index >= @@primes.length
|
|
# Only check for prime factors up to the square root of the potential primes,
|
|
# but without the performance hit of an actual square root calculation.
|
|
if @@next_to_check + 4 > @@ulticheck_next_squared
|
|
@@ulticheck_index += 1
|
|
@@ulticheck_next_squared = @@primes.at(@@ulticheck_index + 1) ** 2
|
|
end
|
|
# Only check numbers congruent to one and five, modulo six. All others
|
|
# are divisible by two or three. This also allows us to skip checking against
|
|
# two and three.
|
|
@@primes.push @@next_to_check if @@primes[2..@@ulticheck_index].find {|prime| @@next_to_check % prime == 0 }.nil?
|
|
@@next_to_check += 4
|
|
@@primes.push @@next_to_check if @@primes[2..@@ulticheck_index].find {|prime| @@next_to_check % prime == 0 }.nil?
|
|
@@next_to_check += 2
|
|
end
|
|
return @@primes[@index]
|
|
end
|
|
alias next succ
|
|
|
|
def each
|
|
loop do
|
|
yield succ
|
|
end
|
|
end
|
|
end
|
|
|
|
class Fixnum
|
|
remove_method :/
|
|
alias / quo
|
|
end
|
|
|
|
class Bignum
|
|
remove_method :/
|
|
alias / quo
|
|
end
|
|
|
|
class Rational
|
|
Unify = true
|
|
|
|
remove_method :inspect
|
|
def inspect
|
|
format "%s/%s", numerator.inspect, denominator.inspect
|
|
end
|
|
|
|
alias power! **
|
|
|
|
def ** (other)
|
|
if other.kind_of?(Rational)
|
|
other2 = other
|
|
if self < 0
|
|
return Complex.new!(self, 0) ** other
|
|
elsif other == 0
|
|
return Rational(1,1)
|
|
elsif self == 0
|
|
return Rational(0,1)
|
|
elsif self == 1
|
|
return Rational(1,1)
|
|
end
|
|
|
|
npd = numerator.prime_division
|
|
dpd = denominator.prime_division
|
|
if other < 0
|
|
other = -other
|
|
npd, dpd = dpd, npd
|
|
end
|
|
|
|
for elm in npd
|
|
elm[1] = elm[1] * other
|
|
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
|
|
return Float(self) ** other2
|
|
end
|
|
elm[1] = elm[1].to_i
|
|
end
|
|
|
|
for elm in dpd
|
|
elm[1] = elm[1] * other
|
|
if !elm[1].kind_of?(Integer) and elm[1].denominator != 1
|
|
return Float(self) ** other2
|
|
end
|
|
elm[1] = elm[1].to_i
|
|
end
|
|
|
|
num = Integer.from_prime_division(npd)
|
|
den = Integer.from_prime_division(dpd)
|
|
|
|
Rational(num,den)
|
|
|
|
elsif other.kind_of?(Integer)
|
|
if other > 0
|
|
num = numerator ** other
|
|
den = denominator ** other
|
|
elsif other < 0
|
|
num = denominator ** -other
|
|
den = numerator ** -other
|
|
elsif other == 0
|
|
num = 1
|
|
den = 1
|
|
end
|
|
Rational.new!(num, den)
|
|
elsif other.kind_of?(Float)
|
|
Float(self) ** other
|
|
else
|
|
x , y = other.coerce(self)
|
|
x ** y
|
|
end
|
|
end
|
|
|
|
def power2(other)
|
|
if other.kind_of?(Rational)
|
|
if self < 0
|
|
return Complex(self, 0) ** other
|
|
elsif other == 0
|
|
return Rational(1,1)
|
|
elsif self == 0
|
|
return Rational(0,1)
|
|
elsif self == 1
|
|
return Rational(1,1)
|
|
end
|
|
|
|
dem = nil
|
|
x = self.denominator.to_f.to_i
|
|
neard = self.denominator.to_f ** (1.0/other.denominator.to_f)
|
|
loop do
|
|
if (neard**other.denominator == self.denominator)
|
|
dem = neaed
|
|
break
|
|
end
|
|
end
|
|
nearn = self.numerator.to_f ** (1.0/other.denominator.to_f)
|
|
Rational(num,den)
|
|
|
|
elsif other.kind_of?(Integer)
|
|
if other > 0
|
|
num = numerator ** other
|
|
den = denominator ** other
|
|
elsif other < 0
|
|
num = denominator ** -other
|
|
den = numerator ** -other
|
|
elsif other == 0
|
|
num = 1
|
|
den = 1
|
|
end
|
|
Rational.new!(num, den)
|
|
elsif other.kind_of?(Float)
|
|
Float(self) ** other
|
|
else
|
|
x , y = other.coerce(self)
|
|
x ** y
|
|
end
|
|
end
|
|
end
|
|
|
|
module Math
|
|
remove_method(:sqrt)
|
|
def sqrt(a)
|
|
if a.kind_of?(Complex)
|
|
abs = sqrt(a.real*a.real + a.image*a.image)
|
|
# if not abs.kind_of?(Rational)
|
|
# return a**Rational(1,2)
|
|
# end
|
|
x = sqrt((a.real + abs)/Rational(2))
|
|
y = sqrt((-a.real + abs)/Rational(2))
|
|
# if !(x.kind_of?(Rational) and y.kind_of?(Rational))
|
|
# return a**Rational(1,2)
|
|
# end
|
|
if a.image >= 0
|
|
Complex(x, y)
|
|
else
|
|
Complex(x, -y)
|
|
end
|
|
elsif a >= 0
|
|
rsqrt(a)
|
|
else
|
|
Complex(0,rsqrt(-a))
|
|
end
|
|
end
|
|
|
|
def rsqrt(a)
|
|
if a.kind_of?(Float)
|
|
sqrt!(a)
|
|
elsif a.kind_of?(Rational)
|
|
rsqrt(a.numerator)/rsqrt(a.denominator)
|
|
else
|
|
src = a
|
|
max = 2 ** 32
|
|
byte_a = [src & 0xffffffff]
|
|
# ruby's bug
|
|
while (src >= max) and (src >>= 32)
|
|
byte_a.unshift src & 0xffffffff
|
|
end
|
|
|
|
answer = 0
|
|
main = 0
|
|
side = 0
|
|
for elm in byte_a
|
|
main = (main << 32) + elm
|
|
side <<= 16
|
|
if answer != 0
|
|
if main * 4 < side * side
|
|
applo = main.div(side)
|
|
else
|
|
applo = ((sqrt!(side * side + 4 * main) - side)/2.0).to_i + 1
|
|
end
|
|
else
|
|
applo = sqrt!(main).to_i + 1
|
|
end
|
|
|
|
while (x = (side + applo) * applo) > main
|
|
applo -= 1
|
|
end
|
|
main -= x
|
|
answer = (answer << 16) + applo
|
|
side += applo * 2
|
|
end
|
|
if main == 0
|
|
answer
|
|
else
|
|
sqrt!(a)
|
|
end
|
|
end
|
|
end
|
|
|
|
module_function :sqrt
|
|
module_function :rsqrt
|
|
end
|
|
|
|
class Complex
|
|
Unify = true
|
|
end
|
|
|