rubysl-mathn 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467e937606c8e419d779633cb724dd5327bfeeff
-  data.tar.gz: 1bcc431f67bb1a5581d5574aa816a7a58eea7971
+  metadata.gz: 2c8f404bbf236fce57e1e6de091af800546663ff
+  data.tar.gz: dd52a75c76ebd8bbc4f8bfbcf23a6cff75b5fbc6
 SHA512:
-  metadata.gz: d3d2f5ab89cab030c46699a7500a816980b5742b6148bb50c63c74cd4cf9bff608e4f520dcd416dd0a1f285251325ece2b646e81675d34447099b29e41ff2d22
-  data.tar.gz: 7f4f2d6254a66cdb96c398e8800f11d7da0440680ce5dce5591874cf27d9edef8be03a73182696e0464c9082cb9a3575298b4d62dc86189ecab6715146391f9f
+  metadata.gz: de4d0b8516c0e11d67c45b04c654b10b68768807993354eeef2fb47a32f26608d18a93ebee4516cd50f80611f6cdb8d55a40c7088c854f71aa05dd52ee40b8d3
+  data.tar.gz: f62b3e29787871eb7b598fea8603a408e5e04b4a8bc4ec1ca67143ecb3974a32c383a2f83aa39b7e656443aee8a9107a766b7fb5038caf3c9e275a15bb118afd

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
-before_install:
-  - gem update --system
-  - gem --version
-  - gem install rubysl-bundler
-script: bundle exec mspec spec
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec
 rvm:
-  - rbx-nightly-18mode
+  - 1.9.3
+  - rbx-nightly-19mode

data/lib/rubysl/mathn/mathn.rb

@@ -1,198 +1,142 @@
+#--
+# $Release Version: 0.5 $
+# $Revision: 1.1.1.1.4.1 $
+
+##
+# = mathn
+#
+# mathn is a library for changing the way Ruby does math.  If you need
+# more precise rounding with multiple division or exponentiation
+# operations, then mathn is the right tool.
+#
+# Without mathn:
+#
+#   3 / 2 => 1 # Integer
+#
+# With mathn:
+#
+#   3 / 2 => 3/2 # Rational
 #
-#   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.)
+# mathn features late rounding and lacks truncation of intermediate results:
 #
-# --
+# Without mathn:
 #
+#   20 / 9 * 3 * 14 / 7 * 3 / 2 # => 18
 #
+# With mathn:
 #
+#   20 / 9 * 3 * 14 / 7 * 3 / 2 # => 20
+#
+#
+# When you require 'mathn', the libraries for Prime, CMath, Matrix and Vector
+# are also loaded.
+#
+# == Copyright
+#
+# Author: Keiju ISHITSUKA (SHL Japan Inc.)
+#--
+# class Numeric follows to make this documentation findable in a reasonable
+# location
 
-require "complex.rb"
-require "rational.rb"
-require "matrix.rb"
+class Numeric; end
 
-class Integer
+require "cmath.rb"
+require "matrix.rb"
+require "prime.rb"
 
-  def gcd2(int)
-    a = self.abs
-    b = int.abs
-    a, b = b, a if a < b
+unless defined?(Math.exp!)
+  Object.instance_eval{remove_const :Math}
+  Math = CMath # :nodoc:
+end
 
-    pd_a = a.prime_division
-    pd_b = b.prime_division
+##
+# When mathn is required, Fixnum's division and exponentiation are enhanced to
+# return more precise values from mathematical expressions.
+#
+#   2/3*3  # => 0
+#   require 'mathn'
+#   2/3*3  # => 2
 
-    gcd = 1
-    for pair in pd_a
-      as = pd_b.assoc(pair[0])
-      if as
-        gcd *= as[0] ** [as[1], pair[1]].min
-      end
-    end
-    return gcd
-  end
+class Fixnum
+  remove_method :/
 
-  def Integer.from_prime_division(pd)
-    value = 1
-    for prime, index in pd
-      value *= prime**index
-    end
-    value
-  end
+  ##
+  # +/+ defines the Rational division for Fixnum.
+  #
+  #   1/3  # => (1/3)
 
-  def prime_division
-    raise ZeroDivisionError if self == 0
-    ps = Prime.new
-    value = self
-    if value < 0
-      value = -value
-      pv = [[-1, 1]]
-    else
-      pv = []
-    end
-    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
+  alias / quo
 
-class Prime
-  include Enumerable
+  alias power! ** unless method_defined? :power!
 
-  def initialize
-    @seed = 1
-    @primes = []
-    @counts = []
-  end
+  ##
+  # Exponentiate by +other+
 
-  def succ
-    i = -1
-    size = @primes.size
-    while i < size
-      if i == -1
-        @seed += 1
-        i += 1
-      else
-        while @seed > @counts[i]
-          @counts[i] += @primes[i]
-        end
-        if @seed != @counts[i]
-          i += 1
-        else
-          i = -1
-        end
-      end
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
     end
-    @primes.push @seed
-    @counts.push @seed + @seed
-    return @seed
   end
-  alias next succ
 
-  def each
-    loop do
-      yield succ
-    end
-  end
 end
 
-class Fixnum
-  alias / quo
-end
+##
+# When mathn is required Bignum's division and exponentiation are enhanced to
+# return more precise values from mathematical expressions.
 
 class Bignum
-  alias / quo
-end
+  remove_method :/
 
-class Rational
-  Unify = true
+  ##
+  # +/+ defines the Rational division for Bignum.
+  #
+  #   (2**72) / ((2**70) * 3)  # => 4/3
 
-  def inspect
-    format "%s/%s", numerator.inspect, denominator.inspect
-  end
+  alias / quo
 
-  alias power! **
+  alias power! ** unless method_defined? :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
+  ##
+  # Exponentiate by +other+
 
-        npd = numerator.prime_division
-        dpd = denominator.prime_division
-        if other < 0
-          other = -other
-          npd, dpd = dpd, npd
-        end
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
+    end
+  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
+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
+##
+# When mathn is required Rational is changed to simplify the use of Rational
+# operations.
+#
+# Normal behaviour:
+#
+#   Rational.new!(1,3) ** 2 # => Rational(1, 9)
+#   (1 / 3) ** 2            # => 0
+#
+# require 'mathn' behaviour:
+#
+#   (1 / 3) ** 2            # => 1/9
 
-        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
+class Rational
+  remove_method :**
+
+  ##
+  # Exponentiate by +other+
+  #
+  #   (1/3) ** 2 # => 1/9
 
-  def power2(other)
+  def ** (other)
     if other.kind_of?(Rational)
+      other2 = other
       if self < 0
-        return Complex(self, 0) ** other
+        return Complex(self, 0.0) ** other
       elsif other == 0
         return Rational(1,1)
       elsif self == 0
@@ -201,16 +145,32 @@ class Rational
         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
+      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
-      nearn = self.numerator.to_f ** (1.0/other.denominator.to_f)
+
+      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)
@@ -224,7 +184,7 @@ class Rational
         num = 1
         den = 1
       end
-      Rational.new!(num, den)
+      Rational(num, den)
     elsif other.kind_of?(Float)
       Float(self) ** other
     else
@@ -234,23 +194,50 @@ class Rational
   end
 end
 
+##
+# When mathn is required, the Math module changes as follows:
+#
+# Standard Math module behaviour:
+#   Math.sqrt(4/9)     # => 0.0
+#   Math.sqrt(4.0/9.0) # => 0.666666666666667
+#   Math.sqrt(- 4/9)   # => Errno::EDOM: Numerical argument out of domain - sqrt
+#
+# After require 'mathn', this is changed to:
+#
+#   require 'mathn'
+#   Math.sqrt(4/9)      # => 2/3
+#   Math.sqrt(4.0/9.0)  # => 0.666666666666667
+#   Math.sqrt(- 4/9)    # => Complex(0, 2/3)
+
 module Math
+  remove_method(:sqrt)
+
+  ##
+  # Computes the square root of +a+.  It makes use of Complex and
+  # Rational to have no rounding errors if possible.
+  #
+  #   Math.sqrt(4/9)      # => 2/3
+  #   Math.sqrt(- 4/9)    # => Complex(0, 2/3)
+  #   Math.sqrt(4.0/9.0)  # => 0.666666666666667
+
   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
+      abs = sqrt(a.real*a.real + a.imag*a.imag)
+#      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
+#      if !(x.kind_of?(Rational) and y.kind_of?(Rational))
+#        return a**Rational(1,2)
+#      end
+      if a.imag >= 0
         Complex(x, y)
       else
         Complex(x, -y)
       end
+    elsif a.respond_to?(:nan?) and a.nan?
+      a
     elsif a >= 0
       rsqrt(a)
     else
@@ -258,6 +245,10 @@ module Math
     end
   end
 
+  ##
+  # Compute square root of a non negative number. This method is
+  # internally used by +Math.sqrt+.
+
   def rsqrt(a)
     if a.kind_of?(Float)
       sqrt!(a)
@@ -303,11 +294,34 @@ module Math
     end
   end
 
+  class << self
+    remove_method(:sqrt)
+  end
   module_function :sqrt
   module_function :rsqrt
 end
 
-class Complex
-  Unify = true
+##
+# When mathn is required, Float is changed to handle Complex numbers.
+
+class Float
+  alias power! **
+
+  ##
+  # Exponentiate by +other+
+
+  def ** (other)
+    if self < 0 && other.round != other
+      Complex(self, 0.0) ** other
+    else
+      power!(other)
+    end
+  end
+
 end
 
+module Rubinius
+  def self.mathn_loaded?
+    true
+  end
+end

data/lib/rubysl/mathn/version.rb

@@ -1,5 +1,5 @@
 module RubySL
   module Mathn
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/rubysl-mathn.gemspec

@@ -19,5 +19,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "mspec", "~> 1.5"
-  spec.add_development_dependency "rubysl-prettyprint", "~> 1.0"
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-mathn
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rubysl-prettyprint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Ruby standard library mathn.
 email:
 - brixen@gmail.com
@@ -122,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Ruby standard library mathn.
@@ -145,4 +131,3 @@ test_files:
 - spec/rational/Rational_spec.rb
 - spec/rational/exponent_spec.rb
 - spec/rational/inspect_spec.rb
-has_rdoc: