feat(tonality): improve compareTo sorting by note and mode (#37)

albertms10 · Apr 9, 2023 · 485284c · 485284c
1 parent c913953
commit 485284c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/src/tonality/tonality.dart b/lib/src/tonality/tonality.dart
@@ -86,8 +86,7 @@ class Tonality implements Comparable<Tonality> {
 
   @override
   int compareTo(covariant Tonality other) => compareMultiple([
-        () => accidentals.compareTo(other.accidentals),
-        () => accidental.semitones.compareTo(other.accidental.semitones),
         () => note.compareTo(other.note),
+        () => mode.name.compareTo(other.mode.name),
       ]);
 }
diff --git a/test/src/tonality/tonality_test.dart b/test/src/tonality/tonality_test.dart
@@ -52,11 +52,11 @@ void main() {
         ]);
         expect(orderedSet.toList(), [
           const Tonality(Note.c, Modes.major),
-          const Tonality(Note.d, Modes.major),
           const Tonality(Note.c, Modes.minor),
+          const Tonality(Note.dFlat, Modes.major),
+          const Tonality(Note.d, Modes.major),
           const Tonality(Note.eFlat, Modes.major),
           const Tonality(Note.fSharp, Modes.minor),
-          const Tonality(Note.dFlat, Modes.major),
         ]);
       });
     });