continued_fractions 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0ff19ce7e60d7cd554c981adc6ecdc7cfd3591dbfbb0c893bee1b6cc2413fd
-  data.tar.gz: 9d5fad37f7c8eefa1be24eb210a395e4cbb39b35fa306e4f234f36ce984cfbbb
+  metadata.gz: f7aa696a6a061c921c1513ffeb7d17ce641a4936e89174e61accd3cf0615ca9f
+  data.tar.gz: 46d89b9a7a7242ec10bd5074858b443ea2b4e01101c6a1f005e512aceb4f880e
 SHA512:
-  metadata.gz: 8c2b1dfd1d72ac337d06f69da05975eafcf888e53cb4bfcc864630d73aa89189d3a297f0cd50a5bdcb440e60600a55ae0f0123300e20dbdb9c82a5d3770dff5c
-  data.tar.gz: b58393bf5eb004fad31e809a9b845eb757bd41919914a4d9afd41a265f8a1eac5461a075edf50a6c20c65c388a9efdfb933b26177baaad028f4671010be478d6
+  metadata.gz: 3388b0c412ace93cc15958c11afa99e4e08059e2be6f4726c37121c6eded00a725406218b14f8679ab252d6c565c5ccbdb4c9e276cef5c1bd8d6a26cc6edf8c5
+  data.tar.gz: fd8308ba053a0e2c09d146e720b5fd195b76fc78903236bb7335f6520e17551a4598905f6f667f35d046f41486e99969b599de16b96b0feb1a204945857f44b0

data/lib/continued_fractions.rb

@@ -26,11 +26,10 @@ 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=DEFAULT_LIMIT)
+  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.
@@ -133,34 +132,37 @@ 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
+    # 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
 
-  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
+      # 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: continued_fractions
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Jose Hales-Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-03 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:
@@ -51,13 +51,12 @@ files:
 - README.md
 - lib/continued_fractions.rb
 - lib/continued_fractions/include.rb
-- lib/continued_fractions/version.rb
-homepage: http://jolohaga.github.io/continued_fractions
+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"
@@ -77,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.4"
-end