continued_fractions 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ce79731f3484473c48365c35263d36ba32fea23
-  data.tar.gz: d67d37574d72195290629e821d0ebd6711b9adad
+  metadata.gz: 833e0f015fc2902302f744f7c1c4901b8b77e51f
+  data.tar.gz: 65ca91e63bfa5adac66a77529de915d9d3bb6145
 SHA512:
-  metadata.gz: 332255ec07d5ca93a60ebb3975197d0a8fc5eba7573cb508de1941c64e5e9bc780e79b0931d2ccd727462b515b0f468429b71f8832cf29d160f87f25b63bf130
-  data.tar.gz: 649f4881e43d47553bae247d3f628c952ae3dcca29e548ebe5b9840165c3415b01aa473d900ed2efdc2c032c79d8f648da30ff1a471518ec00c51ad0b5cb581d
+  metadata.gz: 9267372f711ade8ce6da446a79bd8e3e869361a96f47cd16286ae5a3a22e2be848979da6e0188b959dd8dc1aaaf9de5d0b2ab539fdf65cf0a281e8a35fe73944
+  data.tar.gz: f332b7f14cef53dc9e84f1eef4eacd5bb62aac97f06e9e62ea39a3b274e48bf66e1c67d5ae853b6af2bd5102e8de45f9c91761d98ca3985e046fca8f50054946

data/CHANGELOG

@@ -1,3 +1,13 @@
-v1.5.1 Use attribute accessors where possible
+v0.1.0 Initial release
 
-v1.5.0 Remove ContinuedFractions module; Move its methods into ContinuedFraction class
+v1.1.0 Change public class representation of convergents from an array of Rationals to an array of arrays.
+
+v1.2.0 Change parameter signature of ContinuedFraction#convergents_as_rationals
+
+v1.3.0 Add binary operators: + - * /
+
+v1.4.0 Eliminate need to invoke "include ContinuedFractions"
+
+v1.5.0 Remove ContinuedFractions module; Move its methods into ContinuedFraction class
+
+v1.6.0 Handle rational numbers, finite continued fractions

data/Rakefile

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

data/continued_fractions.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: continued_fractions 1.5.2 ruby lib
+# stub: continued_fractions 1.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "continued_fractions"
-  s.version = "1.5.2"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jose Hales-Garcia"]
-  s.date = "2015-05-03"
+  s.date = "2015-05-10"
   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"]

data/lib/continued_fractions.rb

@@ -124,13 +124,15 @@ class ContinuedFraction
   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
+    Array.new(limit).tap do |qs|
+      limit.times do |i|
+        qs[i] = n.to_i
+        break if ((divisor = n-qs[i]) == 0.0)
+        n = 1.0/divisor
+      end
+      self.limit = qs.compact.length
+    end.compact
   end
 
   def calculate_convergents #:nodoc:

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -4,74 +4,87 @@ 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((cf.convergents_as_rationals - convs)).to be_empty
-  end
-  
-  it "should return array for convergents method" do
+  it "returns an array of convergents" do
     expect(cf.convergents).to be_kind_of(Array)
   end
   
-  it "should preserve the number input" do
+  it "preserves 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 = 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 = 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
-  
-  it "should add a number (on the right-hand-side) with a continued fraction and return a continued fraction" do
+  it "adds a number on the right-hand-side with a continued fraction and returns 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
+  it "subtracts a number on the right-hand-side from a continued fraction and returns 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
+  it "multiplies a number on the right-hand-side with a continued fraction and returns 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
+  it "divides a number on the right-hand-side with a continued fraction and returns 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
+  it "adds a continued fraction with another continued fraction and returns 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
+  it "subtracts a continued fraction with another continued fraction and returns 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
+  it "multiplies a continued fraction with another continued fraction and returns 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
+  it "divides a continued fraction with another continued fraction and returns 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
+  it "assigns the resulting 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
+  
+  context 'with irrational numbers' do
+    it "accurately calculates the convergents" 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((cf.convergents_as_rationals - convs)).to be_empty
+    end
+    
+    it "contains convergents approaching the number" do
+      0.upto(cf.convergents.length-2) do |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 "contains convergents which are expressed in lowest terms" do
+      1.upto(cf.convergents.length-1) do |i|
+        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
+  end
+  
+  context 'with rational numbers' do
+    it 'changes the limit to the number of convergents calculated' do
+      expect(described_class.new(1.5, 10).limit).to be 2
+    end
+    
+    it 'calculates the convergents' do
+      convs = [ '1/1', '3/2' ].map{|c| Rational(c)}
+      expect(described_class.new(1.5, 10).convergents_as_rationals - convs).to be_empty
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec