wtf_chord 0.2.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23feadfbf5375e890423135cc86a56d9b70af3e8
-  data.tar.gz: aaa6a0d46fbeb51e715306da3d127b86816ed293
+  metadata.gz: 0ffe99b5205f9a4cbde1ebdd815a41dc9f8f0836
+  data.tar.gz: d08a21cf109465b729d171e88e7a3f3631ca95df
 SHA512:
-  metadata.gz: 711ef213b9ea7302e812c122fda26aee2bb305960a0a1fc3f687106948ea401dcfe17eaeac3972d9a42f6bdf22f6189d01255be790bf89194dbb5e6479a3d86c
-  data.tar.gz: 4c081a0a57e196422c13fa0a40f671e55d2b39ad49f96678c8b87da277d5e242d4d38fd19924d7e0d920444cc290af7d5984208e75f8a1cbc4dbeeddd10e7547
+  metadata.gz: e250bfa2ee065d20208dfca8831b33c216b2a4c2c450fecae75bef2a9b8c69189c2d6fd244dff31c25c00c38f9549d579f42b7ba6fca557509fb5a88460a2290
+  data.tar.gz: 25a18c48cecc08247ccfa78c6c396d2edd9c4481b0c86f39cf23636fb1b7bf51ba038d15b5e2fd0db8cd89c904aaf5d939cacb1a78233dcd0e7108495e1fd4cc

data/lib/wtf_chord/chord.rb

@@ -1,10 +1,8 @@
 require 'wtf_chord/fingering'
+require 'wtf_chord/fingerings_generator'
 
 module WTFChord
   class Chord
-    MAX_DIST = 5
-    MAX_FRET = 7
-
     attr_reader :pitch, :steps, :notes, :name
 
     def initialize(note, name)
@@ -18,51 +16,13 @@ module WTFChord
       "#{name} (#{@notes.map(&:key) * ' - '})"
     end
 
-    def fingerings(limit = 3)
-      list = []
-
-      (0..MAX_FRET).each do |from_fret|
-        f = get_fingering(from_fret)
-        next if list.include?(f)
-        list << f if all_notes?(f.used_strings)
-      end
-
-      sort_fingerings(list, limit)
-    end
-
-    def get_fingering(from_fret = 0)
-      to_fret = from_fret + MAX_DIST
-      Fingering.new(GUITAR) do |f|
-        f.strings.each do |s|
-          fret = (from_fret..to_fret).detect { |dist| @notes.include?((s.original + dist).note) }
-          fret ? s.hold_on(fret) : s.dead
-        end
-
-        adjust_fingering(f.used_strings[0], to_fret, 0) while should_adjust?(f.used_strings[0], 0)
-      end
-    end
-
-    def all_notes?(strings)
-      snotes = strings.map(&:note).tap(&:uniq!)
-      @notes.all? { |n| snotes.include?(n) }
-    end
-
-    def adjust_fingering(string, to_fret, i = 0)
-      while string.fret < to_fret.pred
-        string.hold_on(string.fret + 1)
-        break if @notes.include?(string.note)
-      end
-
-      string.dead if !string.dead? && string.note != @notes[i]
-    end
-
-    def should_adjust?(string, i = 0)
-      string && string.note != @notes[i]
+    def fingerings(limit = nil)
+      limit ||= 5
+      FingeringsGenerator.new(self).call[0, limit]
     end
 
-    def sort_fingerings(list, limit)
-      list.sort_by!(&:complexity)
-      list[0...limit].sort_by!(&:min_fret)
+    def third_tone
+      @third_tone ||= @notes[@steps.index(7) || -1]
     end
   end
 end

data/lib/wtf_chord/cli.rb

@@ -31,7 +31,7 @@ module WTFChord
     ##
     # Options
     #
-    options['amount'] = 3
+    options['amount'] = 5
     options['output'] = 'default'
     options['rates']  = false
 

data/lib/wtf_chord/complexity_counter.rb

@@ -6,17 +6,27 @@ module WTFChord
 
     def rate
       frets = @fingering.holded_strings.map(&:fret)
-      barre = frets.uniq.keep_if { |o| frets.count(o) >= 2 }.min
-      barre_strings = barre ? frets.count(barre).pred : 0
+      barre = frets.uniq.keep_if { |o| frets.count(o) >= 2 }
+      barre_strings = barre.min ? frets.count(barre.min).pred : 0
 
       base_rate = begin
-        Rational(holded_strings - barre_strings, 6).to_f +
-        Rational(finger_dist(frets), 5).to_f
+        Rational(holded_strings - barre_strings, 4).to_f +
+        Rational(finger_dist(@fingering.used_strings.map(&:fret)), 4).to_f
       end
 
+      base_rate += 0.5 if (holded_strings - barre_strings) > 4
+
       # p [@fingering, holded_strings, barre_strings]
 
-      base_rate += 1 if (barre_strings > 2 || frets.uniq.size > 3) && complex_barre?(barre, frets)
+      if holded_strings > 4
+        uniq_frets = frets.uniq.size
+
+        if barre.size > 1 && uniq_frets == 3 && frets.count(barre.max) > barre_strings.next
+          base_rate += 1 if complex_barre?(barre.max, frets)
+        elsif barre_strings.next >= 2 || uniq_frets.size > 3
+          base_rate += 1 if complex_barre?(barre.min, frets)
+        end
+      end
 
       base_rate
     end

data/lib/wtf_chord/fingering.rb

@@ -4,9 +4,10 @@ require 'wtf_chord/formatter'
 
 module WTFChord
   class Fingering < Fretboard
-    def initialize(guitar)
+    def initialize(guitar, fingers = nil)
       @capo      = guitar.capo
       @strings   = guitar.strings.map(&:dup)
+      set_fingers(fingers) if fingers.is_a?(Array)
       yield(self) if block_given?
     end
 

data/lib/wtf_chord/fingerings_generator.rb

@@ -0,0 +1,85 @@
+module WTFChord
+  class Chord
+  end
+
+  class FingeringsGenerator < DelegateClass(Chord)
+    MAX_DIST = 5
+    MAX_FRET = 7
+
+    def fingerings
+      @fingerings ||= []
+    end
+
+    def call
+      fingerings.clear
+
+      (0...MAX_FRET).each do |from|
+        to = from + MAX_DIST
+        generate(from...to) do |variant|
+          fingerings << variant if filter_variant(variant)
+        end
+      end
+
+      fingerings.sort_by!(&:complexity)
+    end
+
+    private
+
+    def generate(fret_range)
+      combinations = GUITAR.strings.map.with_index do |s, index|
+        fret_range.select do |dist|
+          pitch = s.original + dist
+          has_note?(pitch)
+        end.tap do |frets|
+          frets << nil if frets.size == 0
+        end
+      end
+
+      combinations.inject(&:product).each do |fingers|
+        fingers.flatten!
+        Fingering.new(GUITAR, fingers) do |variant|
+          adjust(variant)
+          yield(variant)
+        end
+      end
+    end
+
+    def filter_variant(variant)
+      used_strings = variant.used_strings
+      used_notes = used_strings.map(&:note)
+      tones_count = notes.map { |n| used_notes.count(n) }
+
+      !fingerings.include?(variant) &&
+      basetone?(used_strings[0]) &&
+      (third?(used_strings[1]) || third?(used_strings[2])) &&
+      all_notes?(used_notes) &&
+      used_notes.each_cons(2).none? { |(l, r)| l == r } &&
+      tones_count.all? { |n| tones_count[0] >= n || tones_count[notes.index(third_tone)] >= n } &&
+      variant.complexity <= 2.25
+    end
+
+    def adjust(fingering)
+      while (string = fingering.used_strings[0]) && !basetone?(string)
+        string.dead if !string.dead?
+        break if fingering.used_strings.size == 4
+      end
+    end
+
+    def all_notes?(used_notes)
+      notes.all? { |n| used_notes.include?(n) }
+    end
+
+    def has_note?(value)
+      value = value.note if !value.is_a?(Note) && value.respond_to?(:note)
+      notes.include?(value)
+    end
+
+    def basetone?(string)
+      string && string.note == notes[0]
+    end
+
+    def third?(string)
+      string && (string.note == third_tone)
+    end
+  end
+end

data/lib/wtf_chord/note.rb

@@ -25,8 +25,9 @@ module WTFChord
 
     def == other
       case other
-      when String        then other.casecmp(@key).zero?
-      when Integer, Note then other == @position
+      when String  then other.casecmp(@key).zero?
+      when Integer then other == @position
+      when Note    then other.position == @position
       end
     end
 

data/lib/wtf_chord/rules.rb

@@ -23,7 +23,9 @@ module WTFChord
       name.match(pattern) do |m|
         base = chords[m[:name]] || chords["M"]
         steps.concat(base)
-        steps.concat(extra[m[:ext]]) if m[:ext] && m[:ext].length <= (6 - steps.length)
+
+        ext = extra[m[:ext]] if m[:ext]
+        steps.concat(ext) if ext
       end
 
       steps.tap(&:uniq!)

data/lib/wtf_chord/version.rb

@@ -1,3 +1,3 @@
 module WTFChord
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: '0.3'
 platform: ruby
 authors:
 - Anton
@@ -107,6 +107,7 @@ files:
 - lib/wtf_chord/cli.rb
 - lib/wtf_chord/complexity_counter.rb
 - lib/wtf_chord/fingering.rb
+- lib/wtf_chord/fingerings_generator.rb
 - lib/wtf_chord/formatter.rb
 - lib/wtf_chord/formatters/base.rb
 - lib/wtf_chord/formatters/default.rb