ChordType Overhaul

Sources/Tonic/Chord.swift

@@ -6,7 +6,7 @@ import Foundation
 ///
 /// A representation of a chord as a set of note classes, with a root note class,
 /// and an inversion defined by the lowest note in the chord.
-public struct Chord: Equatable {
+public struct Chord: Equatable, Codable {
     /// Root note class of the chord
     public let root: NoteClass
 
@@ -30,7 +30,7 @@ public struct Chord: Equatable {
 
     /// Try to initialize a chord from an array of notes.
     ///
-    /// If the array does not fit into a known chord type, this initialier will fail.
+    /// If the array does not fit into a known chord type, this initializer will fail.
     /// - Parameter notes: Note array
     public init?(notes: [Note]) {
         var set = NoteSet()
@@ -97,9 +97,9 @@ public struct Chord: Equatable {
         if let index = key.primaryTriads.firstIndex(where: { $0 == self }) {
             let romanNumeral = capitalRomanNumerals[index]
             switch type {
-            case .majorTriad: return romanNumeral
-            case .minorTriad: return romanNumeral.lowercased()
-            case .diminishedTriad: return "\(romanNumeral.lowercased())°"
+            case .major: return romanNumeral
+            case .minor: return romanNumeral.lowercased()
+            case .dim: return "\(romanNumeral.lowercased())°"
             default: return nil
             }
         }
@@ -155,7 +155,7 @@ extension Chord: CustomStringConvertible {
     /// Useful for custom rendering of slash notation
     public var bassNote: NoteClass {
         switch inversion {
-            case 1...4:
+            case 1...type.intervals.count:
                 if let bass = root.canonicalNote.shiftUp(type.intervals[inversion - 1]) {
                     return bass.noteClass
                 }
@@ -251,15 +251,12 @@ extension Chord {
             }
         }
 
-        // Sorts anti-alphabetical, but the net effect is to pefer flats to sharps
+        // Sorts anti-alphabetical, but the net effect is to prefer flats to sharps
         returnArray.sort { $0.root.letter > $1.root.letter }
 
         // order the array by least number of accidentals
         returnArray.sort { $0.accidentalCount < $1.accidentalCount }
 
-        // order the array preferring root position
-        returnArray.sort { $0.inversion < ($1.inversion > 0 ? 1 : 0) }
-
         // prefer root notes not being uncommon enharmonics
         returnArray.sort { ($0.root.canonicalNote.isUncommonEnharmonic ? 1 : 0) < ($1.root.canonicalNote.isUncommonEnharmonic ? 1 : 0) }
 
@@ -278,6 +275,12 @@ extension Chord {
             }
         }
 
+        // prefer fewer number of characters (favor less complex chords in ranking)
+        returnArray.sort { $0.slashDescription.count < $1.slashDescription.count }
+
+        // order the array preferring root position
+        returnArray.sort { $0.inversion < ($1.inversion > 0 ? 1 : 0) }
+
         return returnArray
     }