tonal-tools 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc49345ed34f38eed1600818c0b28910a5525a22c8388338c5739650339c9ec1
-  data.tar.gz: a63830d52d1ed45aa575c6ee2d924c547a74260697853680928fbc0a586d1cfb
+  metadata.gz: 7b17d9b6d7c072e412308a4fc2c4954ae3ed4517ea052afb253d110f1eec20a5
+  data.tar.gz: 47e961d46ac7dadc1aff2714d1a3cac2fa1926083522bcf88b79b32fc61b795c
 SHA512:
-  metadata.gz: 8111bb7846cc0dc220742313c253f6d719d31213ac05c35443eb4dc27058ec236b6bd13b946ad6870ca38b5e48f853385532bc2513f8897c3e5df10c3be3afed
-  data.tar.gz: cb3b394f94d175c127b874bba207fc4933e49a91197c48822ea8968578ec57d0dd42730b19eb2a7d6a57eebf44b77615d8b84094d2b3419f88d30b5ae34f1e03
+  metadata.gz: 8dee328415918bc354b1b4456a655cd2537a4a293fa21cb7131f599567e16ff44590a31b38c00a9e328a7ba39db6255ede3f8ab2a543819293f351e98ea723bc
+  data.tar.gz: 7924160f12e04fee8feb4cbadcbb3f3ea3ca61d015f9e78d122dbda37423b8c0be701c3c6bc77d06590f998f18278be3c645fe21483ce8bf4d8c22f445fdafe9

data/data/commas.yml

@@ -1,11 +1,13 @@
 commas:
-  # Interval between two enharmonically equivalent notes, as B# and C, in the Pythogorean tuning. ~23 cents
-  ditonic: 531441/524288
-  # The interval between a just major third (5:4) and a Pythogorean third (81:64). ~22 cents
-  syntonic: 81/80
-  # Difference between the syntonic and ditonic commas. ~2 cents
-  schisma: 32805/32768
   diaschisma: 2048/2025
+  # Interval between 16/15 and 10/9, 27/25 and 9/8, 6/5 and 5/4, 8/5 and 5/3, 16/9 and 50/27, 9/5 and 15/8. ~71¢
+  dicot: 25/24
   dieses1: 648/625
   dieses2: 128/125
+  # Interval between two enharmonically equivalent notes, as B# and C, in the Pythogorean tuning. ~23¢
+  ditonic: 531441/524288
+  # Difference between the syntonic and ditonic commas. ~2¢
+  schisma: 32805/32768
   septimal: 64/63
+  # The interval between a just major third (5:4) and a Pythogorean third (81:64). ~22¢
+  syntonic: 81/80

data/lib/tonal/approximation.rb

@@ -41,28 +41,6 @@ class Tonal::Ratio
       end
     end
 
-    # @return [Tonal::Ratio::Approximation::Set] of ratios within cent tolerance of self found using a quotient walk on the fraction tree
-    # @example
-    #   Tonal::Ratio.ed(12,1).approximate.by_quotient_walk(max_prime: 89)
-    #   => (4771397596969315/4503599627370496): [(17/16), (18/17), (35/33), (53/50), (71/67), (89/84), (196/185)]
-    # @param cents_tolerance the cents tolerance used to scope the collection
-    # @param depth the maximum number of ratios in the collection
-    # @param max_prime the maximum prime number to allow in the collection
-    # @param conv_limit the number of convergents to limit the ContinuedFraction method
-    #
-    def by_quotient_walk(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_FRACTION_TREE_DEPTH, max_prime: DEFAULT_MAX_PRIME, conv_limit: CONVERGENT_LIMIT)
-      self_in_cents = to_cents
-      within = cents_tolerance.kind_of?(Tonal::Cents) ? cents_tolerance : Tonal::Cents.new(cents: cents_tolerance)
-
-      Set.new(ratio: ratio) do |ratios|
-        FractionTree.quotient_walk(to_f, limit: conv_limit).each do |node|
-          ratio2 = ratio.class.new(node.weight)
-          ratios << ratio2 if ratio.class.within_cents?(self_in_cents, ratio2.to_cents, within) && ratio2.within_prime?(max_prime)
-          break if ratios.length >= depth
-        end
-      end
-    end
-
     # @return [Tonal::Ratio::Approximation::Set] of fraction tree ratios within cent tolerance of self
     # @example
     #   Tonal::Ratio.ed(12,1).approximate.by_tree_path(max_prime: 17)
@@ -75,8 +53,8 @@ class Tonal::Ratio
       self_in_cents = to_cents
       within = cents_tolerance.kind_of?(Tonal::Cents) ? cents_tolerance : Tonal::Cents.new(cents: cents_tolerance)
       Set.new(ratio: ratio) do |ratios|
-        FractionTree.path_to(to_f).each do |node|
-          ratio2 = ratio.class.new(node.weight)
+        FractionTree.node(to_f).path.each do |node|
+          ratio2 = ratio.class.new(node.number)
           ratios << ratio2 if ratio.class.within_cents?(self_in_cents, ratio2.to_cents, within) && ratio2.within_prime?(max_prime)
           break if ratios.length >= depth
         end

data/lib/tonal/attributions.rb

@@ -1,4 +1,4 @@
 module Tonal
   TOOLS_PRODUCER = "mTonal"
-  TOOLS_VERSION = "5.1.1"
+  TOOLS_VERSION = "5.1.3"
 end

data/lib/tonal/cents.rb

@@ -93,6 +93,7 @@ class Tonal::Cents
   def inspect
     "#{value.round(@precision)}"
   end
+  alias :to_s :inspect
 
   #
   # Challenges to comparing floats

data/lib/tonal/comma.rb

@@ -2,9 +2,9 @@ class Tonal::Comma
   # @return [Hash] of comma key/value pairs
   # @example
   #   Tonal::Comma.commas
-  #   => {"ditonic"=>"531441/524288",
-  #       "syntonic"=>"81/80",
-  #       "schisma"=>"32805/32768",
+  #   => {"diaschisma"=>"2048/2025",
+  #       "dicot"=>"25/24",
+  #       "dieses1"=>"648/625",
   #       ...}
   #
   def self.commas
@@ -14,10 +14,7 @@ class Tonal::Comma
   # @return [Array] of comma values
   # @example
   #   Tonal::Comma.values
-  #   => [(531441/524288),
-  #       (81/80),
-  #       (32805/32768),
-  #       ...]
+  #   => [(2048/2025), (25/24), (648/625), ...]
   #
   def self.values
     @values ||= commas.values.map(&:to_r)
@@ -26,10 +23,7 @@ class Tonal::Comma
   # @return [Array] of comma keys
   # @example
   #   Tonal::Comma.keys
-  #   => ["ditonic",
-  #       "syntonic",
-  #       "schisma",
-  #       ...]
+  #   => ["diaschisma", "dicot", "dieses1", ...]
   #
   def self.keys
     @keys ||= commas.keys

data/lib/tonal/extensions.rb

@@ -32,7 +32,7 @@ class Numeric
   # @return [Array] a tuple of self divided and multiplied by factor
   # @example
   #   Math::PI.div_times(3) => [1.0471975511965976, 9.42477796076938]
-  # @param [Numeric]
+  # @param factor [Numeric]
   #
   def div_times(factor) = [self / factor, self * factor]
 
@@ -329,7 +329,7 @@ class Array
   # @return [Tonal::ReducedRatio] ratio reconstructed from the result of a prime factor decomposition
   # @example
   #   [[[3, 1]], [[2, 1]]].ratio_from_prime_divisions => (3/2)
-  # @reduced [Boolean] if a reduced or unreduced ratio is returned
+  # @param reduced [Boolean] if a reduced or unreduced ratio is returned
   #
   def ratio_from_prime_divisions(reduced: false) = reduced ? Tonal::ReducedRatio.new(Prime.int_from_prime_division(self.first), Prime.int_from_prime_division(self.last)) : Tonal::Ratio.new(Prime.int_from_prime_division(self.first), Prime.int_from_prime_division(self.last))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tonal-tools
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.3
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.1'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.18
 signing_key:
 specification_version: 4
 summary: Tonal tools