continued_fractions 1.2.2 → 1.3.1

data/History.txt

@@ -1,8 +1,19 @@
+=== 1.3.0 / 2011-06-10
+
+* Added binary operators: + - * / between two ContinuedFractions and a ContinuedFraction and a number (on the right-hand-side).  Returns a ContinuedFraction.
+* Added tests for operators.
+
+=== 1.2.3 / 2011-06-09
+
+* Fixed emplementation of #convergent to match its definition.
+* Added exception on #convergent to be raised when index is less than 1.
+* Added mention of ContinuedFractions#convergents_as_rationals in README
+* Changed README example.  Variable real changed to pi.
+
 === 1.2.2 / 2010-03-27
 
 * Moved repo to Git.
 
-
 === 1.2.1 / 2010-03-18
 
 * Updated README file to display change in return class of ContinuedFractions#convergents.

data/README.txt

@@ -16,10 +16,10 @@ Generates quotients and convergents for a given number.
   require 'continued_fractions'  
   include ContinuedFractions
   
-  real = Math::PI
+  pi = Math::PI
   => 3.14159265358979
   
-  cf = ContinuedFraction.new(real,10)
+  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],
@@ -27,12 +27,23 @@ Generates quotients and convergents for a given number.
                        
   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:
 

data/Rakefile

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('continued_fractions', '1.2.2') do |config|
+Echoe.new('continued_fractions', '1.3.1') do |config|
   config.summary                  = 'Generate continued fractions.'
+  config.description              = 'Class for working with continued fractions.'
   config.author                   = 'Jose Hales-Garcia'
   config.url                      = 'http://github.com/jolohaga/continued_fractions'
   config.email                    = 'jolohaga@me.com' 
@@ -11,4 +12,4 @@ Echoe.new('continued_fractions', '1.2.2') do |config|
   config.development_dependencies = ['rspec >=1.3.0','echoe >=4.3']
 end
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each{|ext| load ext}
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each{|ext| load ext}

data/continued_fractions.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{continued_fractions}
-  s.version = "1.2.2"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Hales-Garcia"]
-  s.date = %q{2010-03-27}
-  s.description = %q{Generate continued fractions.}
+  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"]
@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Generate continued fractions.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    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"])
     else

data/lib/continued_fractions.rb

@@ -39,7 +39,8 @@ module ContinuedFractions
     #   => [355,113]
     #
     def convergent(nth)
-      convergents[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
@@ -76,14 +77,56 @@ module ContinuedFractions
     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 _convergents(nth=nil)
+    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
+    def calculate_quotients #:nodoc:
       qs = Array.new(@limit)
       n = @number
       @limit.times do |i|
@@ -93,7 +136,7 @@ module ContinuedFractions
       qs
     end
 
-    def calculate_convergents
+    def calculate_convergents #:nodoc:
       ContinuedFractions.convergents(quotients)
     end
   end

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -31,9 +31,51 @@ module ContinuedFractions
     
     it "should contain convergents which are expressed in lowest terms" do
       1.upto(@cf.convergents.length-1) do |i|
-        convergent_rational_i_minus1, convergent_rational_i = ContinuedFractions.convergent_to_rational(@cf.convergent(i-1)), ContinuedFractions.convergent_to_rational(@cf.convergent(i))
-        (convergent_rational_i_minus1.numerator*convergent_rational_i.denominator - convergent_rational_i.numerator*convergent_rational_i_minus1.denominator).should == (-1)**(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
+    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
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Jose Hales-Garcia
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 -07:00
+date: 2011-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: echoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +46,7 @@ dependencies:
         version: "4.3"
   type: :development
   version_requirements: *id002
-description: Generate continued fractions.
+description: Class for working with continued fractions.
 email: jolohaga@me.com
 executables: []
 
@@ -77,6 +79,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -84,6 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -94,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: continued_fractions
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generate continued fractions.