wtf_chord 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d764a30038a11df351e6d3d9dfce09084aa89af352d92b36677ed5eac31e425
-  data.tar.gz: 0c713ee0f4e3b36720014f56c1c55ca6686981b49e228402d8c2f826463affce
+  metadata.gz: d79d3b4f0a6ef8088987819387a46e7e1b4fd4e03614f131dba94ea7cc19e6c8
+  data.tar.gz: e7122f195b69586a37c6a570bc0e3b64cf5f4ca8f1e357fc2504be86dfc0d0bc
 SHA512:
-  metadata.gz: e83f9de2c3913c4206d7d4f424f46f1082fcd16a50f8f19d4d78f2d83f3a66f610d23852ac66b890190f444db14e74d3fc9249514e6ece64626685c4c7434de2
-  data.tar.gz: 3ac9226adb773858a51c474c0f1b299e3bf2601ce567d9967c96b297ba4b0895da08c6b50e404221ba636be01d83740fea20b3f5684ebb24a2053b4b81235425
+  metadata.gz: d2defd3bdae6c97b0eeb1e899edc1204a53c61a124b6832ac5748c1083fae7714cf322ba53e0000fc36fd217bbd85c0393833fada192cc02df76a2aadd4661b1
+  data.tar.gz: 18d8cf19045668207068d5854108292cc045f35da1e9063b7a3d869c78d2d78a98cad034730b8f950c465223128acb30d754a2b84136926a3358484f8575beeb

data/lib/wtf_chord/chord.rb

@@ -37,7 +37,7 @@ module WTFChord
     end
 
     def size
-      bass? ? -~@notes.size : @notes.size
+      bass? ? [*@notes, bass].uniq.size : @notes.size
     end
 
     def original_bass

data/lib/wtf_chord/collectors/piano.rb

@@ -16,8 +16,11 @@ module WTFChord
         notes.each_cons(2).map { |(a, b)| (a.to_i - b.to_i).abs }
       }
 
-      FirstTone = -> (tone, notes) {
-        Distances[notes]
+      Sorting = -> (tone, notes) {
+        notes = notes.sort
+        mod = (notes[0].note.position - tone.position).abs.next
+        score = Distances[notes[1..-1]].sum
+        mod + score
       }.curry(2).freeze
 
       def collect!
@@ -28,7 +31,7 @@ module WTFChord
           combination(size).
           filter(&FilterProc[size])
         @fingerings.uniq! { |x| x.map(&:key) }
-        @fingerings.sort_by!(&FirstTone[tone])
+        @fingerings.sort_by!(&Sorting[tone])
         @fingerings
       end
     end

data/lib/wtf_chord/version.rb

@@ -1,3 +1,3 @@
 module WTFChord
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wtf_chord
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Anton