Voice Leading

2026-09-30 15:13:00 -05:00
parent 10d295abfe
commit fb92ed78ee
17 changed files with 511 additions and 484 deletions
@@ -9,6 +9,7 @@ import generator.__main__
 import generator.accompaniment
 import generator.arrange.generate
 import generator.guitar
+import generator.fretboard
 import generator.harmony
 import generator.model
 import generator.musicxml
@@ -40,7 +41,7 @@ class MusicModelTests(unittest.TestCase):
      self.assertEqual(set(generator.harmony.pitch_classes(generator.harmony.parse_symbol(label))), expected, label)
    for label, essentials in [('G7b9', {11, 5, 8}), ('C13', {4, 10, 9})]:
      definition = generator.harmony.parse_symbol(label)
-      pitches = generator.guitar.chord_pitches(definition, generator.guitar.chord_positions(generator.guitar.chord_requirements(definition))[0])
+      pitches = generator.fretboard.chord_pitches(definition, generator.guitar.chord_positions(generator.fretboard.chord_requirements(definition))[0])
      self.assertTrue(essentials.issubset({generator.model.pitch_number(p) % 12 for p in pitches}), label)
    with self.assertRaises(ValueError):
      generator.harmony.parse_symbol('Cunrecognized')