Span

tests/test_acoustic_voicing.py

@@ -69,6 +69,7 @@ class AcousticVoicingTests(unittest.TestCase):
       requirements = generator.fretboard.chord_requirements(span.harmony)
       if basses and uppers:
         self.assertTrue(generator.acoustic_voicing.playable(generator.acoustic_voicing.Voicing(*grip)))
+        self.assertLessEqual(max(p.fret for p in grip) - min(p.fret for p in grip) + 1, 3)
         self.assertTrue(requirements.covers({p.midi % 12 for p in grip}))
         self.assertTrue({p.midi % 12 for p in grip} <= set(requirements.allowed))
       for note in span.notes:
@@ -91,7 +92,7 @@ class AcousticVoicingTests(unittest.TestCase):
     self.assertEqual(tests.test_acoustic.sounding(document), before)
     generator.model.validate_document(document)
   def test_four_strings_allow_all_defined_bass_inversions(self):
-    for symbol in ('CM', 'Dm', 'Caug', 'Cdim', 'C7', 'Cdim7', 'Cno5', 'C7b9', 'Dmno1', 'C6', 'C13', 'Csus', 'Csus2'):
+    for symbol in ('CM', 'Dm', 'Caug', 'Cdim', 'C7', 'Cdim7', 'C7no5', 'C7b9', 'C7no1', 'C6', 'C13', 'Csus', 'Csus2'):
       with self.subTest(chord=symbol):
         chord = generator.harmony.parse_symbol(symbol)
         requirements = generator.fretboard.chord_requirements(chord)
@@ -188,13 +189,19 @@ class AcousticVoicingTests(unittest.TestCase):
       frets[index] += 1
       self.assertEqual(generator.acoustic_voicing.movement(before, voicing(frets)), 1)
   def test_fret_and_register_limits_are_hard_constraints(self):
-    for frets, valid in (((1, 1, 1, 1), True), ((1, 4, 1, 4), True), ((1, 5, 1, 4), False), ((0, 1, 1, 1), False), ((12, 15, 14, 12), True), ((13, 13, 13, 13), False), ((12, 16, 14, 12), False), ((12, 21, 12, 12), False)):
+    for frets, valid in (((1, 1, 1, 1), True), ((1, 3, 1, 3), True), ((1, 4, 1, 4), False), ((1, 5, 1, 4), False), ((0, 1, 1, 1), False), ((12, 14, 14, 12), True), ((12, 15, 14, 12), False), ((13, 13, 13, 13), False), ((12, 16, 14, 12), False), ((12, 21, 12, 12), False)):
       with self.subTest(frets=frets):
         self.assertEqual(generator.acoustic_voicing.playable(voicing(frets)), valid)
     for symbol in ('CM', 'C7b9', 'C13', 'Cdim7'):
       self.assertTrue(all(generator.acoustic_voicing.playable(v) for v in candidates(symbol)))
+  def test_autumn_leaves_cm7_and_f7_cannot_span_four_fret_positions(self):
+    for symbol, frets in (('Cm7', (3, 1, 3, 4)), ('F7', (3, 1, 2, 4))):
+      with self.subTest(symbol=symbol):
+        self.assertFalse(generator.acoustic_voicing.playable(voicing(frets)))
+        self.assertNotIn(voicing(frets), candidates(symbol))
+        self.place(planned_document([[(0, symbol)]]))
   def test_acoustic_cost_has_no_register_span_or_shape_penalties(self):
-    options = (voicing((1, 1, 1, 1)), voicing((1, 4, 3, 4)), voicing((12, 12, 12, 12)), voicing((12, 15, 14, 15)))
+    options = (voicing((1, 1, 1, 1)), voicing((1, 3, 2, 3)), voicing((12, 12, 12, 12)), voicing((12, 14, 13, 14)))
     states = [generator.acoustic_voicing.Placement(generator.acoustic_voicing.Cost())]
     result = generator.acoustic_voicing.advance(options, generator.fretboard.ChordRequirements(), states)
     self.assertEqual([p.cost for p in result], [generator.acoustic_voicing.Cost()] * len(options))
@@ -223,16 +230,18 @@ class AcousticVoicingTests(unittest.TestCase):
         options = candidates(symbol)
         self.assertTrue(options)
         self.assertTrue(all(len(v) == 4 and {p.midi % 12 for p in v} == classes for v in options))
-    for symbol, omitted in (('Dmno1', 2), ('C7no5', 7)):
+    for symbol, omitted in (('C7no1', 0), ('C7no5', 7)):
       self.assertTrue(candidates(symbol))
       self.assertTrue(all(omitted not in {p.midi % 12 for p in v} for v in candidates(symbol)))
   def test_unplayable_omission_is_not_restored_to_fill_upper_strings(self):
-    self.assertFalse(candidates('Dmno5'))
-    document = planned_document([[(0, 'Dmno5')]])
-    before = copy.deepcopy(document)
-    with self.assertRaisesRegex(ValueError, 'Dmno5: no acoustic grip.*three-fret span'):
-      generator.acoustic_voicing.place(document)
-    self.assertEqual(document, before)
+    for symbol in ('Dmno5', 'Dmno1', 'CMno5'):
+      with self.subTest(symbol=symbol):
+        self.assertFalse(candidates(symbol))
+        document = planned_document([[(0, symbol)]])
+        before = copy.deepcopy(document)
+        with self.assertRaisesRegex(ValueError, f'{symbol}: no acoustic grip.*3 consecutive fret positions'):
+          generator.acoustic_voicing.place(document)
+        self.assertEqual(document, before)
   def test_explicit_inversions_and_nonchord_slash_basses_are_preserved(self):
     for chord, bass in ((generator.harmony.parse_symbol('Dm') | {'inversion': 1}, 5), (generator.harmony.parse_symbol('C7') | {'inversion': 3}, 10), ('C7/E', 4), ('C7b9/Db', 1), ('Dm/B', 11)):
       with self.subTest(chord=chord):
@@ -267,6 +276,9 @@ class AcousticVoicingTests(unittest.TestCase):
           for note in voice['notes']:
             upper = sorted(p['tablature']['string'] for p in note['pitches'] if p['tablature']['string'] <= 4)
             self.assertIn(upper, ([], [2, 3, 4]))
+            frets = [p['tablature']['fret'] for p in note['pitches']]
+            if frets:
+              self.assertLessEqual(max(frets) - min(frets) + 1, 3)
             self.assertTrue(all('tie_from' not in p and 'tie_to' not in p for p in note['pitches']))
       if path.stem == 'autumn_leaves':
         for index, expected in ((0, voicing((3, 2, 3, 3), 6)), (1, voicing((3, 2, 3, 2), 6)), (4, voicing((3, 2, 3, 3), 6)), (5, voicing((3, 2, 3, 2), 6))):