continued_fractions 1.3.1 → 1.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e21b768abb130daf08c605cec1fbee721b24cff1
+  data.tar.gz: cff6e442d4ce41205cca55fa9157b289eba65a04
+SHA512:
+  metadata.gz: d6c311ab38c8c5a670ed0da1bc7a70631b098c5a15322d5412c97a27f9b4b39e36b1e6111a3be6d6b4e588e88f4db4caf1324e205342d5bf801e75346acdaf75
+  data.tar.gz: bc70d86423da28fe8e112dee2a91d54d2d572ab36cced3b62a9bc4b7e950b1bf2c559001bb48e2e5bb11ac3e901806176e6285c9599bd66e0c93d02275af86f8

data/Gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+# Declare your gem's dependencies in digital_measures.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.

data/LICENSE

@@ -0,0 +1,22 @@
+== License:
+
+  Copyright (c) 2015 Jose Hales-Garcia
+
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  'Software'), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest

@@ -1,6 +1,9 @@
+CHANGELOG
+Gemfile
 History.txt
+LICENSE
 Manifest
-README.txt
+README.md
 Rakefile
 lib/continued_fractions.rb
 spec/continued_fractions/continued_fraction_spec.rb

data/README.md

@@ -0,0 +1,54 @@
+## ContinuedFractions
+
+* http://rubygems.org/gems/continued_fractions
+
+#### Description
+
+Generates quotients and convergents for a given number.
+
+#### Synopsis
+
+    require 'continued_fractions'
+  
+    pi = Math::PI
+    => 3.14159265358979
+    
+    cf = ContinuedFraction.new(pi,10)
+    => #<ContinuedFractions::ContinuedFraction:0x00000101101368 @number=3.14159265358979, @limit=10,
+            @quotients=[3, 7, 15, 1, 292, 1, 1, 1, 2, 1],
+            @convergents=[[0, 1], [1, 0], [3, 1], [22, 7], [333, 106],
+                          [355, 113], [103993, 33102], [104348, 33215], [208341, 66317], [312689, 99532], [833719, 265381], [1146408, 364913]]>
+                         
+    cf.convergents
+    => [[3,1], [22,7], [333,106], [355,113], [103993,33102], [104348,33215], [208341,66317], [312689,99532], [833719,265381], [1146408,364913]]
+    
+    # Convergents can be output as an array of Rationals too
+    cf.convergents_as_rationals
+    [(3/1), (22/7), (333/106), (355/113), (103993/33102), (104348/33215), (208341/66317), (312689/99532), (833719/265381), (1146408/364913)]
+    
+    cf.convergent(1)
+    => [22,7]
+    
+    cf.quotients
+    => [3, 7, 15, 1, 292, 1, 1, 1, 2, 1]
+    
+    # Add, subtract, multiply and divide continued fractions.  The limit of the result is the max limit of the operands.
+    cf2 = ContinuedFraction.new(rand,20)
+    => #<ContinuedFractions::ContinuedFraction:0x000001009dde50 @number=0.03834175394982653, @limit=20, @quotients=[0, 26, 12, 3, 4, 1, 2, 24, 5, 1, 1, 1, 2, 1, 2, 2, 1, 7, 1, 5], @convergents=[[0, 1], [1, 26], [12, 313], [37, 965], [160, 4173], [197, 5138], [554, 14449], [13493, 351914], [68019, 1774019], [81512, 2125933], [149531, 3899952], [231043, 6025885], [611617, 15951722], [842660, 21977607], [2296937, 59906936], [5436534, 141791479], [7733471, 201698415], [59570831, 1553680384], [67304302, 1755378799], [396092341, 10330574379]]>
+    cf + cf2
+    => #<ContinuedFractions::ContinuedFraction:0x000001009d2708 @number=3.1799344075396196, @limit=20, @quotients=[3, 5, 1, 1, 3, 1, 5, 3, 7, 25, 1, 2, 15, 6, 1, 1, 2, 3, 1, 2], @convergents=[[3, 1], [16, 5], [19, 6], [35, 11], [124, 39], [159, 50], [919, 289], [2916, 917], [21331, 6708], [536191, 168617], [557522, 175325], [1651235, 519267], [25326047, 7964330], [153607517, 48305247], [178933564, 56269577], [332541081, 104574824], [844015726, 265419225], [2864588259, 900832499], [3708603985, 1166251724], [10281796229, 3233335947]]>
+
+#### Install
+
+sudo gem install continued_fractions
+
+#### Requirements/Dependencies
+
+* Ruby 2.2+
+* Depends on Ruby's Rational class
+
+##### Developers
+
+* RSpec required to run tests
+* Echoe required to run rake tasks
+  

data/Rakefile

@@ -2,14 +2,20 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('continued_fractions', '1.3.1') do |config|
-  config.summary                  = 'Generate continued fractions.'
-  config.description              = 'Class for working with continued fractions.'
+Echoe.new('continued_fractions', '1.4.0') do |config|
+  config.summary                  = 'Generate continued fractions'
+  config.description              = 'Class for working with continued fractions'
+  
+  config.ruby_version              = ">=2.2.2"
+  config.licenses                  = 'MIT'
+  
   config.author                   = 'Jose Hales-Garcia'
+  config.email                    = 'jolohaga@me.com'
   config.url                      = 'http://github.com/jolohaga/continued_fractions'
-  config.email                    = 'jolohaga@me.com' 
+  
   config.ignore_pattern           = ["tmp/*",".hg/*", ".pkg/*", ".git/*"]
-  config.development_dependencies = ['rspec >=1.3.0','echoe >=4.3']
+
+  config.development_dependencies = ['rspec ~>3.2.0','echoe ~>4.6.6']
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each{|ext| load ext}

data/continued_fractions.gemspec

@@ -1,36 +1,38 @@
 # -*- encoding: utf-8 -*-
+# stub: continued_fractions 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{continued_fractions}
-  s.version = "1.3.1"
+  s.name = "continued_fractions"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jose Hales-Garcia"]
-  s.date = %q{2011-06-10}
-  s.description = %q{Class for working with continued fractions.}
-  s.email = %q{jolohaga@me.com}
-  s.extra_rdoc_files = ["README.txt", "lib/continued_fractions.rb"]
-  s.files = ["History.txt", "Manifest", "README.txt", "Rakefile", "lib/continued_fractions.rb", "spec/continued_fractions/continued_fraction_spec.rb", "spec/spec_helper.rb", "continued_fractions.gemspec"]
-  s.homepage = %q{http://github.com/jolohaga/continued_fractions}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Continued_fractions", "--main", "README.txt"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{continued_fractions}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Generate continued fractions.}
+  s.authors = ["Jose Hales-Garcia"]
+  s.date = "2015-05-03"
+  s.description = "Class for working with continued fractions"
+  s.email = "jolohaga@me.com"
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/continued_fractions.rb"]
+  s.files = ["CHANGELOG", "Gemfile", "History.txt", "LICENSE", "Manifest", "README.md", "Rakefile", "continued_fractions.gemspec", "lib/continued_fractions.rb", "spec/continued_fractions/continued_fraction_spec.rb", "spec/spec_helper.rb"]
+  s.homepage = "http://github.com/jolohaga/continued_fractions"
+  s.licenses = ["MIT"]
+  s.rdoc_options = ["--line-numbers", "--title", "Continued_fractions", "--main", "README.md"]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
+  s.rubyforge_project = "continued_fractions"
+  s.rubygems_version = "2.4.5"
+  s.summary = "Generate continued fractions"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<echoe>, [">= 4.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.2.0"])
+      s.add_development_dependency(%q<echoe>, ["~> 4.6.6"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<echoe>, [">= 4.3"])
+      s.add_dependency(%q<rspec>, ["~> 3.2.0"])
+      s.add_dependency(%q<echoe>, ["~> 4.6.6"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<echoe>, [">= 4.3"])
+    s.add_dependency(%q<rspec>, ["~> 3.2.0"])
+    s.add_dependency(%q<echoe>, ["~> 4.6.6"])
   end
 end

data/lib/continued_fractions.rb

@@ -9,138 +9,6 @@
 #
 #
 module ContinuedFractions
-  class ContinuedFraction
-    attr_accessor :number, :quotients, :limit
-    attr_writer :convergents
-    
-    # For a given number calculate its continued fraction quotients and convergents up to limit.
-    #
-    # The limit is 5 by default. Pass an integer in the second parameter to change it.
-    #
-    # Example:
-    #   cf = ContinuedFraction.new(Math::PI,10)
-    #   => #<ContinuedFractions::ContinuedFraction:0x000001010ed5c8 @number=3.14159265358979, @limit=10,
-    #       @quotients=[3, 7, 15, 1, 292, 1, 1, 1, 2, 1],
-    #       @convergents=[[0, 1], [1, 0], [3, 1], [22, 7], [333, 106],
-    #                     [355, 113], [103993, 33102], [104348, 33215], [208341, 66317], [312689, 99532], [833719, 265381], [1146408, 364913]]>
-    #
-    def initialize(number,limit=5)
-      @number = number
-      @limit = limit
-      @quotients = calculate_quotients
-      @convergents = calculate_convergents
-    end
-    
-    # Return nth convergent.
-    #
-    # Example:
-    #   cf = ContinuedFraction.new(Math::PI,10)
-    #   cf.convergent(3)
-    #   => [355,113]
-    #
-    def convergent(nth)
-      raise(IndexError, "Convergent index must be greater than zero.") unless nth > 0
-      convergents[nth-1]
-    end
-    
-    # Return array of convergents of the continued fraction instance up to the nth convergent as an array
-    # comprising of numerators in [i,0] and denominators in [i,1].
-    # If nth is nil, then return the entire list.
-    #
-    # Example:
-    #   cf = ContinuedFraction.new(Math::PI,10)
-    #   cf.convergents
-    #   => [[3,1], [22,7], [333,106], [355,113], [103993,33102],
-    #       [104348,33215], [208341,66317], [312689,99532], [833719,265381], [1146408,364913]]
-    #
-    # Or:
-    #   cf.convergents(3)
-    #   => [[3,1], [22,7], [333,106]]
-    #
-    def convergents(nth=nil)
-      _convergents(nth)
-    end
-    
-    # Return array of convergents of the continued fraction instance converted as Rationals.
-    # If nth is nil, then return the entire list.
-    #
-    # Example:
-    #   cf = ContinuedFraction.new(Math::PI,10)
-    #   cf.convergents_as_rationals
-    #   => [(3/1), (22/7), (333/106), (355/113), (103993/33102),
-    #       (104348/33215), (208341/66317), (312689/99532), (833719/265381), (1146408/364913)]
-    #
-    # Or:
-    #   cf.convergents_as_rationals(3)
-    #   => [(3/1), (22/7), (333/106)]
-    #
-    def convergents_as_rationals(nth=nil)
-      ContinuedFractions.convergents_array_to_rationals(convergents,nth)
-    end
-    
-    def +(other)
-      _number_of(other) do |num,prec|
-        _evaluate("#{@number} + #{num}",prec)
-      end
-    end
-    
-    def -(other)
-      _number_of(other) do |num,prec|
-        _evaluate("#{@number} - #{num}",prec)
-      end
-    end
-    
-    def /(other)
-      _number_of(other) do |num,prec|
-        _evaluate("#{@number} / #{num}",prec)
-      end
-    end
-    
-    def *(other)
-      _number_of(other) do |num,prec|
-        _evaluate("#{@number} * #{num}",prec)
-      end
-    end
-
-    private
-    def _evaluate(e,p) #:nodoc:
-      ContinuedFraction.new(eval(e), p)
-    end
-    
-    def _number_of(n) #:nodoc:
-      num = nil
-      prec = nil
-      case n.class.name
-      when "Fixnum","Integer"
-        num = n
-        prec = @limit
-      when "ContinuedFractions::ContinuedFraction"
-        num = n.number
-        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)
-      n = @number
-      @limit.times do |i|
-        qs[i] = n.to_i
-        n = 1.0/(n-qs[i])
-      end
-      qs
-    end
-
-    def calculate_convergents #:nodoc:
-      ContinuedFractions.convergents(quotients)
-    end
-  end
-
   class << self
     def convergence_matrix(n,m,fill=nil) #:nodoc:
       conv_mat = Array.new(n).map!{Array.new(m,fill)}
@@ -183,4 +51,136 @@ module ContinuedFractions
       Rational(convergent[0],convergent[1])
     end
   end
+end
+
+class ContinuedFraction
+  attr_accessor :number, :quotients, :limit
+  attr_writer :convergents
+  
+  # For a given number calculate its continued fraction quotients and convergents up to limit.
+  #
+  # The limit is 5 by default. Pass an integer in the second parameter to change it.
+  #
+  # Example:
+  #   cf = ContinuedFraction.new(Math::PI,10)
+  #   => #<ContinuedFractions::ContinuedFraction:0x000001010ed5c8 @number=3.14159265358979, @limit=10,
+  #       @quotients=[3, 7, 15, 1, 292, 1, 1, 1, 2, 1],
+  #       @convergents=[[0, 1], [1, 0], [3, 1], [22, 7], [333, 106],
+  #                     [355, 113], [103993, 33102], [104348, 33215], [208341, 66317], [312689, 99532], [833719, 265381], [1146408, 364913]]>
+  #
+  def initialize(number,limit=5)
+    @number = number
+    @limit = limit
+    @quotients = calculate_quotients
+    @convergents = calculate_convergents
+  end
+  
+  # Return nth convergent.
+  #
+  # Example:
+  #   cf = ContinuedFraction.new(Math::PI,10)
+  #   cf.convergent(3)
+  #   => [355,113]
+  #
+  def convergent(nth)
+    raise(IndexError, "Convergent index must be greater than zero.") unless nth > 0
+    convergents[nth-1]
+  end
+  
+  # Return array of convergents of the continued fraction instance up to the nth convergent as an array
+  # comprising of numerators in [i,0] and denominators in [i,1].
+  # If nth is nil, then return the entire list.
+  #
+  # Example:
+  #   cf = ContinuedFraction.new(Math::PI,10)
+  #   cf.convergents
+  #   => [[3,1], [22,7], [333,106], [355,113], [103993,33102],
+  #       [104348,33215], [208341,66317], [312689,99532], [833719,265381], [1146408,364913]]
+  #
+  # Or:
+  #   cf.convergents(3)
+  #   => [[3,1], [22,7], [333,106]]
+  #
+  def convergents(nth=nil)
+    _convergents(nth)
+  end
+  
+  # Return array of convergents of the continued fraction instance converted as Rationals.
+  # If nth is nil, then return the entire list.
+  #
+  # Example:
+  #   cf = ContinuedFraction.new(Math::PI,10)
+  #   cf.convergents_as_rationals
+  #   => [(3/1), (22/7), (333/106), (355/113), (103993/33102),
+  #       (104348/33215), (208341/66317), (312689/99532), (833719/265381), (1146408/364913)]
+  #
+  # Or:
+  #   cf.convergents_as_rationals(3)
+  #   => [(3/1), (22/7), (333/106)]
+  #
+  def convergents_as_rationals(nth=nil)
+    ContinuedFractions.convergents_array_to_rationals(convergents,nth)
+  end
+  
+  def +(other)
+    _number_of(other) do |num,prec|
+      _evaluate("#{@number} + #{num}",prec)
+    end
+  end
+  
+  def -(other)
+    _number_of(other) do |num,prec|
+      _evaluate("#{@number} - #{num}",prec)
+    end
+  end
+  
+  def /(other)
+    _number_of(other) do |num,prec|
+      _evaluate("#{@number} / #{num}",prec)
+    end
+  end
+  
+  def *(other)
+    _number_of(other) do |num,prec|
+      _evaluate("#{@number} * #{num}",prec)
+    end
+  end
+
+  private
+  def _evaluate(e,p) #:nodoc:
+    ContinuedFraction.new(eval(e), p)
+  end
+  
+  def _number_of(n) #:nodoc:
+    num = nil
+    prec = nil
+    case n.class.name
+    when "Fixnum","Integer"
+      num = n
+      prec = @limit
+    when "ContinuedFraction"
+      num = n.number
+      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)
+    n = @number
+    @limit.times do |i|
+      qs[i] = n.to_i
+      n = 1.0/(n-qs[i])
+    end
+    qs
+  end
+
+  def calculate_convergents #:nodoc:
+    ContinuedFractions.convergents(quotients)
+  end
 end

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -1,81 +1,77 @@
 require File.join(File.dirname(__FILE__), "/../spec_helper")
 
-module ContinuedFractions
-  describe ContinuedFraction do
-    it "should accurately calculate the convergents of a real number" 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 = ContinuedFraction.new(Math::PI,10)
-      (ContinuedFractions.convergents_array_to_rationals(@cf.convergents) - convs).empty?.should == true
-    end
-    
-    before(:each) do
-      @number = rand
-      @cf = ContinuedFraction.new(@number,10)
-    end
-    
-    it "should return array for convergents method" do
-      @cf.convergents.class.should == Array
-    end
-    
-    it "should preserve the number input" do
-      @cf.number.should == @number
-    end
-    
-    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 - @cf.number).abs <= (convergent_rational_i - @cf.number).abs).should == 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.numerator*convergent_rational_i_plus1.denominator - convergent_rational_i_plus1.numerator*convergent_rational_i.denominator).should == (-1)**(i)
-      end
-    end
-    
-    it "should add a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
-      (@cf + 3).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should subtract a number (on the right-hand-side) from a continued fraction and return a continued fraction" do
-      (@cf - 3).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should multiply a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
-      (@cf * 3).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should divide a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
-      (@cf / 3).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should add a continued fraction with another continued fraction and return a continued fraction" do
-      c = ContinuedFraction.new(rand,20)
-      (@cf + c).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should subtract a continued fraction with another continued fraction and return a continued fraction" do
-      c = ContinuedFraction.new(rand,20)
-      (@cf - c).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should multiply a continued fraction with another continued fraction and return a continued fraction" do
-      c = ContinuedFraction.new(rand,20)
-      (@cf * c).class.should == ContinuedFractions::ContinuedFraction
-    end
-    
-    it "should divide a continued fraction with another continued fraction and return a continued fraction" do
-      c = ContinuedFraction.new(rand,20)
-      (@cf / c).class.should == ContinuedFractions::ContinuedFraction
+describe ContinuedFraction do
+  let(:cf) { described_class.new(number,10) }
+  let(:number) { rand }
+  
+  it "should accurately calculate the convergents of a real number" 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
+  end
+  
+  it "should return array for convergents method" do
+    expect(cf.convergents).to be_kind_of(Array)
+  end
+  
+  it "should preserve the number input" do
+    expect(cf.number).to eq number
+  end
+  
+  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])
+      expect(((convergent_rational_i_plus1 - cf.number).abs <= (convergent_rational_i - cf.number).abs)).to be true
     end
-    
-    it "should assign the result continued fraction of a binary operation the max limit of the two operands" do
-      c = ContinuedFraction.new(rand,20)
-      result = @cf + c
-      result.limit.should == [@cf.limit,c.limit].max
+  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))
+      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
+  
+  it "should add a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
+    expect((cf + 3)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should subtract a number (on the right-hand-side) from a continued fraction and return a continued fraction" do
+    expect((cf - 3)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should multiply a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
+    expect((cf * 3)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should divide a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
+    expect((cf / 3)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should add a continued fraction with another continued fraction and return a continued fraction" do
+    c = described_class.new(rand,20)
+    expect((cf + c)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should subtract a continued fraction with another continued fraction and return a continued fraction" do
+    c = described_class.new(rand,20)
+    expect((cf - c)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should multiply a continued fraction with another continued fraction and return a continued fraction" do
+    c = described_class.new(rand,20)
+    expect((cf * c)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should divide a continued fraction with another continued fraction and return a continued fraction" do
+    c = described_class.new(rand,20)
+    expect((cf / c)).to be_kind_of(ContinuedFraction)
+  end
+  
+  it "should assign the result continued fraction of a binary operation the max limit of the two operands" do
+    c = described_class.new(rand,20)
+    result = cf + c
+    expect(result.limit).to eq [cf.limit,c.limit].max
+  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), "/../lib") 
 require 'rubygems' 
 require 'rspec' 
-require 'continued_fractions'
-include ContinuedFractions
+require 'continued_fractions'

metadata

@@ -1,106 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: continued_fractions
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 1
-  version: 1.3.1
+version: !ruby/object:Gem::Version
+  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Jose Hales-Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-10 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: echoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 3
-        version: "4.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: echoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.6
   type: :development
-  version_requirements: *id002
-description: Class for working with continued fractions.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.6.6
+description: Class for working with continued fractions
 email: jolohaga@me.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.txt
+extra_rdoc_files:
+- CHANGELOG
+- LICENSE
+- README.md
 - lib/continued_fractions.rb
-files: 
+files:
+- CHANGELOG
+- Gemfile
 - History.txt
+- LICENSE
 - Manifest
-- README.txt
+- README.md
 - Rakefile
+- continued_fractions.gemspec
 - lib/continued_fractions.rb
 - spec/continued_fractions/continued_fraction_spec.rb
 - spec/spec_helper.rb
-- continued_fractions.gemspec
-has_rdoc: true
 homepage: http://github.com/jolohaga/continued_fractions
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
+rdoc_options:
+- "--line-numbers"
+- "--title"
 - Continued_fractions
-- --main
-- README.txt
-require_paths: 
+- "--main"
+- README.md
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: 2.2.2
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: continued_fractions
-rubygems_version: 1.3.7
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
-summary: Generate continued fractions.
+specification_version: 4
+summary: Generate continued fractions
 test_files: []
-

data/README.txt

@@ -1,84 +0,0 @@
-= ContinuedFractions
-
-* http://rubygems.org/gems/continued_fractions
-
-== Description:
-
-Generates quotients and convergents for a given number.
-
-== Features/Problems:
-
-* Requires Ruby 1.9+
-* Depends on Ruby 1.9's Rational class
-
-== Synopsis:
-
-  require 'continued_fractions'  
-  include ContinuedFractions
-  
-  pi = Math::PI
-  => 3.14159265358979
-  
-  cf = ContinuedFraction.new(pi,10)
-  => #<ContinuedFractions::ContinuedFraction:0x00000101101368 @number=3.14159265358979, @limit=10,
-          @quotients=[3, 7, 15, 1, 292, 1, 1, 1, 2, 1],
-          @convergents=[[0, 1], [1, 0], [3, 1], [22, 7], [333, 106],
-                        [355, 113], [103993, 33102], [104348, 33215], [208341, 66317], [312689, 99532], [833719, 265381], [1146408, 364913]]>
-                       
-  cf.convergents
-  => [[3,1], [22,7], [333,106], [355,113], [103993,33102], [104348,33215], [208341,66317], [312689,99532], [833719,265381], [1146408,364913]]
-
-  # Convergents can be output as an array of Rationals too
-  cf.convergents_as_rationals
-  [(3/1), (22/7), (333/106), (355/113), (103993/33102), (104348/33215), (208341/66317), (312689/99532), (833719/265381), (1146408/364913)]
-  
-  cf.convergent(1)
-  => [22,7]
-  
-  cf.quotients
-  => [3, 7, 15, 1, 292, 1, 1, 1, 2, 1]
-  
-  # Add, subtract, multiply and divide continued fractions.  The limit of the result is the max limit of the operands.
-  cf2 = ContinuedFraction.new(rand,20)
-  => #<ContinuedFractions::ContinuedFraction:0x000001009dde50 @number=0.03834175394982653, @limit=20, @quotients=[0, 26, 12, 3, 4, 1, 2, 24, 5, 1, 1, 1, 2, 1, 2, 2, 1, 7, 1, 5], @convergents=[[0, 1], [1, 26], [12, 313], [37, 965], [160, 4173], [197, 5138], [554, 14449], [13493, 351914], [68019, 1774019], [81512, 2125933], [149531, 3899952], [231043, 6025885], [611617, 15951722], [842660, 21977607], [2296937, 59906936], [5436534, 141791479], [7733471, 201698415], [59570831, 1553680384], [67304302, 1755378799], [396092341, 10330574379]]>
-  cf + cf2
-  => #<ContinuedFractions::ContinuedFraction:0x000001009d2708 @number=3.1799344075396196, @limit=20, @quotients=[3, 5, 1, 1, 3, 1, 5, 3, 7, 25, 1, 2, 15, 6, 1, 1, 2, 3, 1, 2], @convergents=[[3, 1], [16, 5], [19, 6], [35, 11], [124, 39], [159, 50], [919, 289], [2916, 917], [21331, 6708], [536191, 168617], [557522, 175325], [1651235, 519267], [25326047, 7964330], [153607517, 48305247], [178933564, 56269577], [332541081, 104574824], [844015726, 265419225], [2864588259, 900832499], [3708603985, 1166251724], [10281796229, 3233335947]]>
-  
-
-== Requirements:
-
-* Ruby 1.9+
-
-== Install:
-
-sudo gem install continued_fractions
-
-== Developers:
-
-* Ruby 1.9+
-* RSpec required to run tests.
-* Echoe required to run rake tasks.
-
-== License:
-
-  Copyright (c) 2010 Jose Hales-Garcia
-
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  'Software'), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-  
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
-  
-  THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-