tonal-tools 5.0.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f085a27fce9f25e0dab185ae58880802186931c3946a39d41e9e975d2fb138
-  data.tar.gz: f4bb5d1c1778aa14b8dd35080be434f409f711a6bd515893276209c338cb4c60
+  metadata.gz: 83c904daf57681752be14329c6cd8630d700561d6184cb84705b908694b6f944
+  data.tar.gz: d64f5204212366b729be2f30609031aa50e8046d16c671f883d4957b0d2a8ad8
 SHA512:
-  metadata.gz: 28328c475862c7a51e34d6ea9cfeabe3ede92f7716515bf7ca514c4cff2a1e07fba240fd76a0ad98fc96c0c07b2fc15c047df31b957b032956805da3cbf862d0
-  data.tar.gz: 25b3b997fd617897c43f1d543424581a36f4d26f06c05fbc28ae7b7a6d1b1d53e13c97761380da36f9e8a9160b1124edf85d81aeb4a2aec527646c096ecb1b46
+  metadata.gz: 1e8d2d083e168674ede2557213f36e722fced30e775d8ca4b52496005b7a317d8fa1ecb30ea4255e09049deb43b6c31b3b68a83b82ecbc19bd8d274cbdfc37bb
+  data.tar.gz: 632412ee397215fd1ee8eae32e412374a6b91d9432ec51cb047caeafe135347116f670b4da377d2f0031a89557911e6b7a8b0a1e3e57acb231235068f684c3a8

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
-  septimal: 64/63
+  # 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

@@ -4,6 +4,9 @@ class Tonal::Ratio
     DEFAULT_MAX_GRID_SCALE = 100
     DEFAULT_MAX_GRID_BOUNDARY = 5
     DEFAULT_DEPTH = Float::INFINITY
+    DEFAULT_FRACTION_TREE_DEPTH = 10
+    DEFAULT_SUPERPART_DEPTH = 20
+    DEFAULT_NEIGHBORHOOD_DEPTH = 10
     DEFAULT_COMPLEXITY_AMOUNT = 50.0
     CONVERGENT_LIMIT = 10
 
@@ -47,7 +50,7 @@ class Tonal::Ratio
     # @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_DEPTH, max_prime: DEFAULT_MAX_PRIME, conv_limit: CONVERGENT_LIMIT)
+    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)
 
@@ -68,7 +71,7 @@ class Tonal::Ratio
     # @param depth the maximum number of ratios in the collection
     # @param max_prime the maximum prime number to allow in the collection
     #
-    def by_tree_path(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_DEPTH, max_prime: DEFAULT_MAX_PRIME)
+    def by_tree_path(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_FRACTION_TREE_DEPTH, max_prime: DEFAULT_MAX_PRIME)
       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|
@@ -89,7 +92,7 @@ class Tonal::Ratio
     # @param max_prime the maximum prime number to allow in the collection
     # @param superpart if the superior part is the numerator or denominator
     #
-    def by_superparticular(cents_tolerance: Tonal::Cents::TOLERANCE, depth: 20, max_prime: DEFAULT_MAX_PRIME, superpart: :upper)
+    def by_superparticular(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_SUPERPART_DEPTH, max_prime: DEFAULT_MAX_PRIME, superpart: :upper)
       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|
@@ -113,7 +116,7 @@ class Tonal::Ratio
     # @param max_boundary the maximum distance grid ratios will be from the scaled ratio
     # @param max_scale the maximum self will be scaled
     #
-    def by_neighborhood(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_DEPTH, max_prime: DEFAULT_MAX_PRIME, max_boundary: DEFAULT_MAX_GRID_BOUNDARY, max_scale: DEFAULT_MAX_GRID_SCALE)
+    def by_neighborhood(cents_tolerance: Tonal::Cents::TOLERANCE, depth: DEFAULT_NEIGHBORHOOD_DEPTH, max_prime: DEFAULT_MAX_PRIME, max_boundary: DEFAULT_MAX_GRID_BOUNDARY, max_scale: DEFAULT_MAX_GRID_SCALE)
       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|

data/lib/tonal/attributions.rb

@@ -1,4 +1,4 @@
 module Tonal
   TOOLS_PRODUCER = "mTonal"
-  TOOLS_VERSION = "5.0.1"
+  TOOLS_VERSION = "5.1.2"
 end

data/lib/tonal/cents.rb

@@ -56,6 +56,7 @@ class Tonal::Cents
     @value.round(precision)
   end
   alias :cents :value
+  alias :to_f :value
 
   # @return
   #   [Tonal::Cents] nearest hundredth cent value
@@ -92,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tonal-tools
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Jose Hales-Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -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.9
 signing_key:
 specification_version: 4
 summary: Tonal tools