continued_fractions 1.8.0 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9253bbf7cf75a29375e99c2bdec92f643413eba529a1d360e0165d2ce98fbdd7
-  data.tar.gz: '09063bf865028894dd41c43bc47118d8445dd79811154f7c862cf1ab696cff93'
+  metadata.gz: ff0ff19ce7e60d7cd554c981adc6ecdc7cfd3591dbfbb0c893bee1b6cc2413fd
+  data.tar.gz: 9d5fad37f7c8eefa1be24eb210a395e4cbb39b35fa306e4f234f36ce984cfbbb
 SHA512:
-  metadata.gz: ce2f1dbad5629bef37ea84ceaa549005e0c0c73931ecbf54e36f3f779b22c3256505e4719fe3095fbaa116937ed01307eeded90547491db96084994a6459e77b
-  data.tar.gz: 1b881899377e3ba060db5d03666ac3451703a169bf768bee1aebc5e512b91c8bc1c5c15373669514854b33cf623449e8588a329f6a68026a22363d268efae2c7
+  metadata.gz: 8c2b1dfd1d72ac337d06f69da05975eafcf888e53cb4bfcc864630d73aa89189d3a297f0cd50a5bdcb440e60600a55ae0f0123300e20dbdb9c82a5d3770dff5c
+  data.tar.gz: b58393bf5eb004fad31e809a9b845eb757bd41919914a4d9afd41a265f8a1eac5461a075edf50a6c20c65c388a9efdfb933b26177baaad028f4671010be478d6

data/LICENSE

@@ -1,6 +1,6 @@
 == License:
 
-  Copyright (c) 2015 Jose Hales-Garcia
+  Copyright (c) 2021 Jose Hales-Garcia
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

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/version.rb

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

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) 2015 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,13 @@ 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
   end
-  
+
   # Return nth convergent.
   #
   # Example:
@@ -40,7 +44,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 +63,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 +81,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 +109,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)
@@ -142,19 +146,27 @@ class ContinuedFraction
   end
 
   def calculate_convergents #:nodoc:
-    convs = convergence_matrix(quotients.length+2,2,1)
-    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
-    convs[2...nth+2]
+    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:
-    conv_mat = Array.new(n).map!{Array.new(m,fill)}
-    conv_mat[0][0],conv_mat[1][1] = 0,0
-    conv_mat
+    Array.new(n).map!{Array.new(m,fill)}.tap do |conv_mat|
+      conv_mat[0][0],conv_mat[1][1] = 0,0
+    end
   end
 end
+
+# @return [ContinuedFraction] new instance
+# @see ContinuedFraction#initialize
+#
+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.0
+  version: 1.8.4
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 description: Class for working with continued fractions
 email: jolohaga@me.com
 executables: []
@@ -33,23 +47,21 @@ extra_rdoc_files:
 - README.md
 - lib/continued_fractions.rb
 files:
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- continued_fractions.gemspec
 - lib/continued_fractions.rb
-- spec/continued_fractions/continued_fraction_spec.rb
-- spec/spec_helper.rb
+- lib/continued_fractions/include.rb
+- lib/continued_fractions/version.rb
 homepage: http://jolohaga.github.io/continued_fractions
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/jolohaga/continued_fractions
 post_install_message: 
 rdoc_options:
 - "--line-numbers"
 - "--title"
-- Continued_fractions
+- continued_fractions
 - "--main"
 - README.md
 require_paths:

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in continued_fractions.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/continued_fractions.gemspec

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'continued_fractions/version'
-
-Gem::Specification.new do |spec|
-  spec.name = "continued_fractions"
-  spec.version = ContinuedFractions::VERSION
-
-  spec.required_rubygems_version = Gem::Requirement.new(">= 1.2") if spec.respond_to? :required_rubygems_version=
-  spec.require_paths = ["lib"]
-  spec.authors = ["Jose Hales-Garcia"]
-  spec.date = "2016-10-26"
-  spec.description = "Class for working with continued fractions"
-  spec.email = "jolohaga@me.com"
-  spec.extra_rdoc_files = ["LICENSE", "README.md", "lib/continued_fractions.rb"]
-  spec.files = ["Gemfile", "LICENSE", "README.md", "Rakefile", "continued_fractions.gemspec", "lib/continued_fractions.rb", "spec/continued_fractions/continued_fraction_spec.rb", "spec/spec_helper.rb"]
-  spec.homepage = "http://jolohaga.github.io/continued_fractions"
-  spec.licenses = ["MIT"]
-  spec.rdoc_options = ["--line-numbers", "--title", "Continued_fractions", "--main", "README.md"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
-  spec.rubyforge_project = "continued_fractions"
-  spec.rubygems_version = "2.5.1"
-  spec.summary = "Generate continued fractions"
-
-  if spec.respond_to? :specification_version then
-    spec.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      spec.add_development_dependency(%q<rspec>, ["~> 3.2"])
-    else
-      spec.add_dependency(%q<rspec>, ["~> 3.2"])
-    end
-  else
-    spec.add_dependency(%q<rspec>, ["~> 3.2"])
-  end
-end

data/spec/continued_fractions/continued_fraction_spec.rb

@@ -1,90 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
-
-describe ContinuedFraction do
-  let(:cf) { described_class.new(number, 10) }
-  let(:number) { rand }
-
-  describe '#convergents' do
-    it "returns an array" do
-      expect(cf.convergents).to be_kind_of(Array)
-    end
-
-    context 'with irrational numbers' do
-      it "accurately calculates the convergents" do
-        # First 10 convergents of PI are...
-        convs = [3/1r, 22/7r, 333/106r, 355/113r, 103993/33102r, 104348/33215r, 208341/66317r, 312689/99532r, 833719/265381r, 1146408/364913r]
-        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/1r, 3/2r ]
-        expect(described_class.new(1.5, 10).convergents_as_rationals - convs).to be_empty
-      end
-    end
-  end
-
-  describe '#number' do
-    it "preserves the number input" do
-      expect(cf.number).to eq number
-    end
-  end
-
-  describe 'operators' do
-    let(:cf2) { described_class.new(rand, 20) }
-
-    %i{+ - * /}.each do |op|
-      describe "#{op}" do
-        [3, 3.0, 3/1r, described_class.new(rand, 20)].each do |rhs|
-          it "#{rhs.class.name} operates on the right-hand side and returns a ContinuedFraction" do
-            expect(cf.send(op, rhs)).to be_kind_of(ContinuedFraction)
-          end
-        end
-
-        it "Assigns the max limit of the two operands" do
-          result = cf.send(op, cf2)
-          expect(result.limit).to eq [cf.limit, cf2.limit].max
-        end
-      end
-    end
-  end
-
-  describe 'comparing' do
-    context 'when numbers are the same' do
-      let(:cf2) { described_class.new(cf.number) }
-
-      it "the ContinuedFractions are equal" do
-        expect(cf).to eq cf2
-      end
-    end
-
-    context 'when numbers are different' do
-      let(:cond) { [['+', '<'], ['-', '>']].sample }
-      let(:cf2) { described_class.new(cf.number.send(cond[0], 1.0)) }
-
-      it "the ContinuedFractions are unequal" do
-        expect(cf.send(cond[1], cf2)).to be true
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,13 +0,0 @@
-$LOAD_PATH << File.join(File.dirname(__FILE__), "/../lib")
-require 'rubygems'
-require 'rspec'
-require 'continued_fractions'
-
-RSpec.configure do |config|
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
-  config.formatter = :documentation
-end