coltrane 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389f01b2c9f2a783e912534f02c9b0a1506f3c9bb4274f3c08c7e94eb18559d6
-  data.tar.gz: d2550c127ae11b1798559d41195b3905c6481019195e1a634e54386e14e66215
+  metadata.gz: 2d2c4c2f31729c93b6b3e8a37715d3686210da80970f4f42ea5205e8e39f029c
+  data.tar.gz: 376e9ca70b7b63896ea315383695a26b624a6bf90e5397776e8700104de078a9
 SHA512:
-  metadata.gz: 8a5ee68e12b83f27ea1f0da1e74efad208548a6d1376bcc75e828f64c777b24964ac1ce40ee7a9df1e9c9555e3228565335e233938f68231cd656eb64e14057f
-  data.tar.gz: 4b84d5abe27a48bf6dff5942860d16be8ae77b18cccff75f507eee1f5de078a8caac1b31fb7333b83181b08b4a7af44241c9ba7a3f8e63288c397e520edd8add
+  metadata.gz: 52459e563498115c43f5e69c7da097102c598ef941beb5917df7c3867bf850616ed54978fb6119d6443e6e129255a916e7b4f2583e51dc8a6013134d0e69fbae
+  data.tar.gz: 458eba1dfdfdb95a535b6dd2520ce32bec09aa3ef98aa1f6482855ca878071ebebd818cfd4a75fd3ff30060101196bbc9f438db2dfc5a3ba7d3120533e9bf0c2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coltrane (3.2.0)
+    coltrane (3.3.0)
       color (~> 1.8)
       dry-monads (~> 0.4)
       paint (~> 2.0)

data/lib/coltrane/representation/guitar/chord.rb

@@ -39,19 +39,19 @@ module Coltrane
         end
 
         def rank
-          +completeness * 10_000 +
-          +fullness     * 1000 +
-          -spreadness   * 100 +
-          +easyness     * 1
+          +completeness  * 10_000 +
+          +fullness      * 1_000 +
+          -spreadness    * 10 +
+          -discontinuity * 1 +
+          +easyness      * 1
         end
 
         def analysis
-          {
-            completeness: completeness,
-            fullness:     fullness,
-            easyness:     easyness,
-            spreadness:   spreadness
-          }
+          %i[completeness discontinuity fullness spreadness easyness]
+          .reduce({}) do |output, criteria|
+            output.merge(criteria => send(criteria).round(2))
+          end
+          .merge(rank: rank.round(4))
         end
 
         def spreadness
@@ -70,6 +70,10 @@ module Coltrane
           (guitar.strings.size.to_f - frets.count(nil)) / guitar.strings.size
         end
 
+        def discontinuity
+          voicing.discontinuity
+        end
+
         def barre?
           !@barre.nil?
         end
@@ -153,12 +157,14 @@ module Coltrane
             [(0 unless barre?)].compact
         end
 
-        def to_s
-          guitar_notes.map { |n| n.fret.nil? ? 'x' : n.fret }.join('-')
+        def to_s(debug = false)
+          guitar_notes.map {
+            |n| n.fret.nil? ? 'x' : n.fret
+          }.join('-') + (debug ? ' ' + analysis.to_s : '')
         end
 
         def voicing
-          Coltrane::Voicing.new(pitches: guitar_notes.map(&:pitch).compact)
+          Theory::Voicing.new(pitches: guitar_notes.map(&:pitch).compact)
         end
 
         private

data/lib/coltrane/theory/frequency.rb

@@ -3,12 +3,17 @@
 module Coltrane
   module Theory
     class Frequency
+      include Comparable
       attr_reader :frequency
 
       def initialize(frequency)
         @frequency = frequency.to_f
       end
 
+      def <=>(other)
+        to_f <=> other.to_f
+      end
+
       class << self
         alias [] new
       end

data/lib/coltrane/theory/pitch.rb

@@ -4,6 +4,7 @@ module Coltrane
   module Theory
     # It describes a pitch, like E4 or Bb5. It's like a note, but it has an octave
     class Pitch
+      include Comparable
       attr_reader :integer
 
       def initialize(notation_arg = nil,
@@ -29,6 +30,10 @@ module Coltrane
         new *args
       end
 
+      def <=>(other)
+        integer <=> other.integer
+      end
+
       def scientific_notation
         "#{pitch_class}#{octave}"
       end

data/lib/coltrane/theory/voicing.rb

@@ -5,16 +5,19 @@ module Coltrane
     # This class describes an actual implementation of a Chord, being aware
     # of exact octaves of each pitch and even repeating pitches across octaves.
     class Voicing
+
       attr_reader :pitches
 
       def initialize(*pitch_strings, pitches: nil)
-        @pitches = if pitch_strings.any?
-                     pitch_strings.map { |s| Pitch[s] }
-                   elsif pitches
-                     pitches
-                   else
-                     raise WrongArgumentsError
-                   end
+        @pitches = begin
+          if pitch_strings.any?
+           pitch_strings.map { |s| Pitch[s] }
+          elsif pitches
+           pitches
+          else
+           raise WrongArgumentsError
+          end
+        end.sort
       end
 
       def self.[](*args)
@@ -34,8 +37,22 @@ module Coltrane
       end
 
       def frequencies
-        pitches.map(&:frequency)
+        @frequencies ||= pitches.map(&:frequency)
+      end
+
+      def discontinuity
+        frequencies.each_with_index.reduce(0) do |max_dist, (freq, index)|
+          next 0 if index.zero?
+          [max_dist, freq.to_f - frequencies[index - 1].to_f].max
+        end
       end
+
+      private
+
+      def ideal_frequency_distance
+        (Pitch['D3'].frequency - Pitch['A2'].frequency).to_f
+      end
+
     end
   end
 end

data/lib/coltrane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coltrane
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coltrane
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Pedro Maciel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader