continued_fractions 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3beec97175d427fec8bc5715efa6499a7c4e9705365b54ecac376b1a27c27636
-  data.tar.gz: 286cdeda5f5581953ff39c193926d9a94d4693d0757f25e4c580655aa371b9f3
+  metadata.gz: f7aa696a6a061c921c1513ffeb7d17ce641a4936e89174e61accd3cf0615ca9f
+  data.tar.gz: 46d89b9a7a7242ec10bd5074858b443ea2b4e01101c6a1f005e512aceb4f880e
 SHA512:
-  metadata.gz: ddbe0f9f64b4f7cce8bb461d8145b377e8256e130cb492b62039fa1e1cfd93b1fbbfde890b54512a962f887b9b3eb9bcfb8e60e9b7b90134505d65e6f02cbd7e
-  data.tar.gz: 539fb7194853af5edc6bbcdd7b25af6ce7899fcf329d19c4c691f1ff675f0049ce73fba269b05457a6868983c29187454e25e35cae2e9aadc062c93e10c7b389
+  metadata.gz: 3388b0c412ace93cc15958c11afa99e4e08059e2be6f4726c37121c6eded00a725406218b14f8679ab252d6c565c5ccbdb4c9e276cef5c1bd8d6a26cc6edf8c5
+  data.tar.gz: fd8308ba053a0e2c09d146e720b5fd195b76fc78903236bb7335f6520e17551a4598905f6f667f35d046f41486e99969b599de16b96b0feb1a204945857f44b0

data/lib/continued_fractions/include.rb

@@ -0,0 +1,12 @@
+module ContinuedFractions
+  module Numeric
+    def to_cf(limit: ContinuedFraction::DEFAULT_LIMIT)
+      ContinuedFraction.new(self, limit)
+    end
+    alias :to_continued_fraction :to_cf
+  end
+end
+
+Float.include(ContinuedFractions::Numeric)
+Integer.include(ContinuedFractions::Numeric)
+Rational.include(ContinuedFractions::Numeric)

data/lib/continued_fractions.rb

@@ -1,16 +1,20 @@
-# ContinuedFractions
+require 'continued_fractions/include'
+
+# ContinuedFraction
 #
 # Generates quotients and convergents for a given number
 #
 # Author:: Jose Hales-Garcia (mailto:jolohaga@me.com)
-# Copyright:: Copyright (c) 2021 Jose Hales-Garcia
+# Copyright:: Copyright (c) 2022 Jose Hales-Garcia
 #
 #
 class ContinuedFraction
   include ::Comparable
 
   attr_accessor :number, :quotients, :limit
-  
+
+  DEFAULT_LIMIT = 5
+
   # 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.
@@ -22,13 +26,12 @@ class ContinuedFraction
   #       @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)
+  def initialize(number, limit=DEFAULT_LIMIT)
     @number = number
-    @limit = limit
-    @quotients = calculate_quotients
-    @convergents = calculate_convergents
+    @ratioed_number = number.to_r
+    @quotients, @convergents, @limit = calculate_quotients_and_convergents(number, limit)
   end
-  
+
   # Return nth convergent.
   #
   # Example:
@@ -40,7 +43,7 @@ class ContinuedFraction
     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.
@@ -59,7 +62,7 @@ class ContinuedFraction
     nth ||= @convergents.length
     @convergents[0...nth]
   end
-  
+
   # Return array of convergents of the continued fraction instance converted as Rationals.
   # If nth is nil, then return the entire list.
   #
@@ -77,25 +80,25 @@ class ContinuedFraction
     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)
     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)
@@ -105,11 +108,11 @@ class ContinuedFraction
   def <=>(other)
     number <=> other.number
   end
-  
+
   def convergent_to_rational(convergent) #:nodoc:
     Rational(convergent[0],convergent[1])
   end
-  
+
   private
   def evaluate(exp, prec) #:nodoc:
     ContinuedFraction.new(eval(exp), prec)
@@ -129,40 +132,43 @@ class ContinuedFraction
     yield(num,prec)
   end
 
-  def calculate_quotients #:nodoc:
-    n = number
-    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_quotients_and_convergents(x, limit)
+    _quotients = []
+    _convergents = []
 
-  def calculate_convergents #:nodoc:
-    nth = nil
-    convergence_matrix(quotients.length+2,2,1).tap do |convs|
-      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
-    end[2...nth+2]
-  end
-  
-  def convergence_matrix(n,m,fill=nil) #:nodoc:
-    Array.new(n).map!{Array.new(m,fill)}.tap do |conv_mat|
-      conv_mat[0][0],conv_mat[1][1] = 0,0
+    # Initialize the initial values for p and q
+    p_minus_1, q_minus_1 = 0, 1
+    p_0, q_0 = 1, 0
+
+    n = x.to_i
+
+    # Loop for maximum specified terms or until the fractional part becomes zero
+    limit.times do
+      _quotients << n
+
+      # Calculate the new p and q
+      p_n = n * p_0 + p_minus_1
+      q_n = n * q_0 + q_minus_1
+
+      _convergents << [p_n, q_n]
+
+      # Recalculate the fractional part
+      x = 1.0 / (x - n)
+      break if x.infinite? || _convergents.include?([@ratioed_number.numerator, @ratioed_number.denominator])
+
+      # Update the old values
+      p_minus_1, q_minus_1 = p_0, q_0
+      p_0, q_0 = p_n, q_n
+      n = x.to_i
     end
+
+    return _quotients, _convergents, _quotients.length
   end
 end
 
 # @return [ContinuedFraction] new instance
 # @see ContinuedFraction#initialize
 #
-def ContinuedFraction(number,limit=5)
-  ContinuedFraction.new(number,limit=5)
+def ContinuedFraction(number,limit=ContinuedFraction::DEFAULT_LIMIT)
+  ContinuedFraction.new(number,limit)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Jose Hales-Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '11.1'
 description: Class for working with continued fractions
-email: jolohaga@me.com
+email: jose@halesgarcia.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -50,13 +50,13 @@ files:
 - LICENSE
 - README.md
 - lib/continued_fractions.rb
-- lib/continued_fractions/version.rb
-homepage: http://jolohaga.github.io/continued_fractions
+- lib/continued_fractions/include.rb
+homepage: https://jolohaga.github.io/continued_fractions
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/jolohaga/continued_fractions
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--line-numbers"
 - "--title"
@@ -76,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Generate continued fractions
 test_files: []

data/lib/continued_fractions/version.rb

@@ -1,3 +0,0 @@
-module ContinuedFractions
-  VERSION = "1.8.3"
-end