fraction-tree 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13b1fb1ddd328714a431288ee0ec04205fb9001ce4a2d1b339e62bef0ed8e4c
-  data.tar.gz: 55260283f52cfa95dd50ecb02f83baaa436752d85b6fd53b3505d6f752ebb600
+  metadata.gz: 9d4c2e3c84acc2fa31151b2863bf7c602490e891004198884e8002a7b7f3cc32
+  data.tar.gz: c335d6bfb3f54c8471835cbc9283d904f8d71f7786cfde02a41448a1840ecb02
 SHA512:
-  metadata.gz: df04fd1122e08f92ff5bb611f82d9ac582ac26c30e02542f02b9030b2ee248a5ba4f9e9080239fed64587bb55f74db80ec6dcb726e5550d881e61a6f54f616ce
-  data.tar.gz: db61b0ede817e7b8c1bac18ec4ab07627c20efaef739d01a8fb06bc49db80b7c3cd9243d79a5cdc873085cc0e8482b07eb528ad7ca1c2fb3c0dcceb6761bb402
+  metadata.gz: ef4347b24418118dbf6f4c8fdc6ac03829829aaf5c15d51295befda2f6bddad1b7022b7b428906998ab2a18106a68850dacdc61c3616a345d911f5db32008c86
+  data.tar.gz: 940a05ae9a163d32cae321457da5135334f8a45a96bd0a6141d420d133216c912cd50826c33c3488fa7c17c96286ec11e755e2c8199afe4cddc8fee9846e25bf

data/lib/fraction_tree.rb

@@ -1,3 +1,4 @@
+require "bigdecimal/util"
 require "continued_fractions"
 
 # @author Jose Hales-Garcia
@@ -66,6 +67,8 @@ class FractionTree
     #
     def path_to(number, find_parents: false, segment: base_segment)
       return Node.new(number.numerator, number.denominator) if number.zero?
+      number = number.kind_of?(Float) ? number.to_d : number
+
       q = Node.new(number.numerator, number.denominator)
       l = segment.first
       h = segment.last
@@ -200,6 +203,37 @@ class FractionTree
       end
     end
 
+    # @return [Array] of Farey neighbors to the given number. A Farey neighbor is a number b/c, who's relationship to a/b is such that ad − bc = 1, when c/d < a/b and bc − ad = 1 when c/d > a/b.
+    # @example
+    #   FractionTree.farey_neighbors(3/2r, 10)
+    #   => [(1/1), (2/1), (4/3), (5/3), (7/5), (8/5), (10/7), (11/7), (13/9), (14/9)]
+    # @param number with neighbors
+    # @param range of harmonic series to search
+    #
+    def farey_neighbors(number, range = 10**(decimal_power(number.numerator)+2))
+      ratio = number.to_r
+      denominator = ratio.denominator
+
+      [].tap do |collection|
+        (1..range-1).each do |i|
+          lower, upper = plus_minus(ratio, Rational(1,i*denominator))
+          collection << lower if farey_neighbors?(ratio, lower)
+          collection << upper if farey_neighbors?(ratio, upper)
+        end
+      end
+    end
+
+    # @return [Boolean] whether two numbers are Farey neighbors
+    # @example
+    #   FractionTree.farey_neighbors?(3/2r, 4/3r) => true
+    #   FractionTree.farey_neighbors?(3/2r, 7/4r) => false
+    # @param num1 of comparison
+    # @param num2 of comparison
+    #
+    def farey_neighbors?(num1, num2)
+      (num1.numerator * num2.denominator - num1.denominator * num2.numerator).abs == 1
+    end
+
     private
     def computed_base_segment(number)
       floor = number.floor
@@ -215,18 +249,15 @@ class FractionTree
       _sequence(depth - 1, segment: [segment.first, mediant]) + [mediant] + _sequence(depth - 1, segment: [mediant, segment.last])
     end
 
-    def farey_neighbors?(num1, num2)
-      (num1.numerator * num2.denominator - num1.denominator * num2.numerator).abs == 1
+    def plus_minus(number, diff)
+      [number - diff, number + diff]
+    end
+
+    def decimal_power(number)
+      Math.log10(number.abs).floor
     end
   end
 
-  # @attr_reader numerator [Integer]
-  #   The numerator of the node
-  # @attr_reader denominator [Integer]
-  #   The denominator of the node
-  # @attr_reader weight [Rational|Infinity]
-  #   The value of the node
-  #
   class Node
     include Comparable
 
@@ -256,8 +287,16 @@ class FractionTree
     # Needed for intersection operations to work.
     # https://blog.mnishiguchi.com/ruby-intersection-of-object-arrays
     # https://shortrecipes.blogspot.com/2006/10/ruby-intersection-of-two-arrays-of.html
+    # Also, allows using with Set, which uses Hash as storage and equality of its elements is determined according to Object#eql? and Object#hash.
+    #
     def eql?(rhs)
-      rhs.kind_of?(self.class) && weight == rhs.weight
+       rhs.instance_of?(self.class) && weight == rhs.weight
+    end
+
+    def hash
+       p, q = 17, 37
+       p = q * @id.hash
+       p = q * @name.hash
     end
 
     def +(rhs)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fraction-tree
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: continued_fractions
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rspec-benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: A collection of Stern-Brocot based models and methods
 email: jose@halesgarcia.com
 executables: []
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.1'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Fraction tree