continued_fractions 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21b768abb130daf08c605cec1fbee721b24cff1
-  data.tar.gz: cff6e442d4ce41205cca55fa9157b289eba65a04
+  metadata.gz: f0122ca9d3d5652ed7b6ae7d91e569d50b7ef1bd
+  data.tar.gz: 1e83d11105ddcb0d59076526a87e994bcaef4341
 SHA512:
-  metadata.gz: d6c311ab38c8c5a670ed0da1bc7a70631b098c5a15322d5412c97a27f9b4b39e36b1e6111a3be6d6b4e588e88f4db4caf1324e205342d5bf801e75346acdaf75
-  data.tar.gz: bc70d86423da28fe8e112dee2a91d54d2d572ab36cced3b62a9bc4b7e950b1bf2c559001bb48e2e5bb11ac3e901806176e6285c9599bd66e0c93d02275af86f8
+  metadata.gz: a99457b5cb78d9b4dbc55bd2301b546ecf08e21c359eece3683abfbf2d3d2cf91294c5ab9afb94615ceb62757587a138fdb02194dde442da25ca0dbd7e6b082f
+  data.tar.gz: ea78b244bbee7ac1def880af96b5fc9fa786df525da0419e50c1d4d8c98c7f036311d99ad96be698c9f1459ec77f2acf984552552237dc620dad156c0c59b936

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('continued_fractions', '1.4.0') do |config|
+Echoe.new('continued_fractions', '1.5.0') do |config|
   config.summary                  = 'Generate continued fractions'
   config.description              = 'Class for working with continued fractions'
   

data/continued_fractions.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: continued_fractions 1.4.0 ruby lib
+# stub: continued_fractions 1.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "continued_fractions"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/continued_fractions.rb

@@ -1,58 +1,11 @@
 # ContinuedFractions
 #
-# Generates quotients and convergents for a given number.
-#
-# Requires Ruby 1.9+
+# Generates quotients and convergents for a given number
 #
 # Author:: Jose Hales-Garcia (mailto:jolohaga@me.com)
-# Copyright:: Copyright (c) 2010 Jose Hales-Garcia
+# Copyright:: Copyright (c) 2015 Jose Hales-Garcia
 #
 #
-module ContinuedFractions
-  class << self
-    def convergence_matrix(n,m,fill=nil) #:nodoc:
-      conv_mat = Array.new(n).map!{Array.new(m,fill)}
-      conv_mat[0][0],conv_mat[1][1] = 0,0
-      conv_mat
-    end
-    
-    # Given an array of quotients return the array of convergents up to the nth convergent.
-    # If nth is nil, return the entire list.
-    #
-    # Example:
-    #   ContinuedFractions.convergents([3,7,15,1])
-    #   => [[3, 1], [22, 7], [333, 106], [355, 113]]
-    #
-    # Or:
-    #   ContinuedFractions.convergents([3,7,15,1], 3)
-    #   => [[3, 1], [22, 7], [333, 106]]
-    #
-    def convergents(quotients,nth=nil)
-      convs = ContinuedFractions.convergence_matrix(quotients.length+2,2,1)
-      nth ||= convs.length
-      2.upto(quotients.length+1) do |i|
-        i_minus1,i_minus2 = i-1,i-2
-        convs[i][0] = convs[i_minus1][0]*quotients[i_minus2]+convs[i_minus2][0]
-        convs[i][1] = convs[i_minus1][1]*quotients[i_minus2]+convs[i_minus2][1]
-      end
-      convs[2...nth+2]
-    end
-    
-    # Convert the convergents array to Rationals
-    #
-    def convergents_array_to_rationals(convergents,nth=nil) #:nodoc:
-      nth ||= convergents.length
-      convergents[0...nth].map{|convergent| convergent_to_rational(convergent)}
-    end
-    
-    # Convert a convergent element to a Rational
-    #
-    def convergent_to_rational(convergent) #:nodoc:
-      Rational(convergent[0],convergent[1])
-    end
-  end
-end
-
 class ContinuedFraction
   attr_accessor :number, :quotients, :limit
   attr_writer :convergents
@@ -102,7 +55,8 @@ class ContinuedFraction
   #   => [[3,1], [22,7], [333,106]]
   #
   def convergents(nth=nil)
-    _convergents(nth)
+    nth ||= @convergents.length
+    @convergents[0...nth]
   end
   
   # Return array of convergents of the continued fraction instance converted as Rationals.
@@ -119,61 +73,61 @@ class ContinuedFraction
   #   => [(3/1), (22/7), (333/106)]
   #
   def convergents_as_rationals(nth=nil)
-    ContinuedFractions.convergents_array_to_rationals(convergents,nth)
+    nth ||= convergents.length
+    convergents[0...nth].map{|convergent| convergent_to_rational(convergent)}
   end
   
   def +(other)
-    _number_of(other) do |num,prec|
-      _evaluate("#{@number} + #{num}",prec)
+    number_of(other) do |num,prec|
+      evaluate("#{@number} + #{num}",prec)
     end
   end
   
   def -(other)
-    _number_of(other) do |num,prec|
-      _evaluate("#{@number} - #{num}",prec)
+    number_of(other) do |num,prec|
+      evaluate("#{@number} - #{num}",prec)
     end
   end
   
   def /(other)
-    _number_of(other) do |num,prec|
-      _evaluate("#{@number} / #{num}",prec)
+    number_of(other) do |num,prec|
+      evaluate("#{@number} / #{num}",prec)
     end
   end
   
   def *(other)
-    _number_of(other) do |num,prec|
-      _evaluate("#{@number} * #{num}",prec)
+    number_of(other) do |num,prec|
+      evaluate("#{@number} * #{num}",prec)
     end
   end
-
+  
+  def convergent_to_rational(convergent) #:nodoc:
+    Rational(convergent[0],convergent[1])
+  end
+  
   private
-  def _evaluate(e,p) #:nodoc:
-    ContinuedFraction.new(eval(e), p)
+  def evaluate(exp, prec) #:nodoc:
+    ContinuedFraction.new(eval(exp), prec)
   end
   
-  def _number_of(n) #:nodoc:
+  def number_of(n) #:nodoc:
     num = nil
     prec = nil
     case n.class.name
     when "Fixnum","Integer"
       num = n
-      prec = @limit
+      prec = limit
     when "ContinuedFraction"
       num = n.number
-      prec = [n.limit,@limit].max
+      prec = [n.limit,limit].max
     end
     yield(num,prec)
   end
-  
-  def _convergents(nth=nil) #:nodoc:
-    nth ||= @convergents.length
-    @convergents[0...nth]
-  end
 
   def calculate_quotients #:nodoc:
-    qs = Array.new(@limit)
+    qs = Array.new(limit)
     n = @number
-    @limit.times do |i|
+    limit.times do |i|
       qs[i] = n.to_i
       n = 1.0/(n-qs[i])
     end
@@ -181,6 +135,19 @@ class ContinuedFraction
   end
 
   def calculate_convergents #:nodoc:
-    ContinuedFractions.convergents(quotients)
+    convs = convergence_matrix(quotients.length+2,2,1)
+    nth ||= convs.length
+    2.upto(quotients.length+1) do |i|
+      i_minus1,i_minus2 = i-1,i-2
+      convs[i][0] = convs[i_minus1][0]*quotients[i_minus2]+convs[i_minus2][0]
+      convs[i][1] = convs[i_minus1][1]*quotients[i_minus2]+convs[i_minus2][1]
+    end
+    convs[2...nth+2]
+  end
+  
+  def convergence_matrix(n,m,fill=nil) #:nodoc:
+    conv_mat = Array.new(n).map!{Array.new(m,fill)}
+    conv_mat[0][0],conv_mat[1][1] = 0,0
+    conv_mat
   end
 end

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -8,7 +8,7 @@ describe ContinuedFraction do
     # First 10 convergents of PI are...
     convs = ['3/1', '22/7', '333/106', '355/113', '103993/33102', '104348/33215', '208341/66317', '312689/99532', '833719/265381', '1146408/364913'].map{|c| Rational(c)}
     cf = described_class.new(Math::PI,10)
-    expect((ContinuedFractions.convergents_array_to_rationals(cf.convergents) - convs)).to be_empty
+    expect((cf.convergents_as_rationals - convs)).to be_empty
   end
   
   it "should return array for convergents method" do
@@ -21,14 +21,14 @@ describe ContinuedFraction do
   
   it "should contain convergents approaching the number" do
     0.upto(cf.convergents.length-2) do |i|
-      convergent_rational_i_plus1, convergent_rational_i = ContinuedFractions.convergent_to_rational(cf.convergents[i+1]), ContinuedFractions.convergent_to_rational(cf.convergents[i])
+      convergent_rational_i_plus1, convergent_rational_i = cf.convergent_to_rational(cf.convergents[i+1]), cf.convergent_to_rational(cf.convergents[i])
       expect(((convergent_rational_i_plus1 - cf.number).abs <= (convergent_rational_i - cf.number).abs)).to be true
     end
   end
   
   it "should contain convergents which are expressed in lowest terms" do
     1.upto(cf.convergents.length-1) do |i|
-      convergent_rational_i, convergent_rational_i_plus1 = ContinuedFractions.convergent_to_rational(cf.convergent(i)), ContinuedFractions.convergent_to_rational(cf.convergent(i+1))
+      convergent_rational_i, convergent_rational_i_plus1 = cf.convergent_to_rational(cf.convergent(i)), cf.convergent_to_rational(cf.convergent(i+1))
       expect((convergent_rational_i.numerator*convergent_rational_i_plus1.denominator - convergent_rational_i_plus1.numerator*convergent_rational_i.denominator)).to eq (-1)**(i)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jose Hales-Garcia