Chord Families

generator/acoustic_voicing.py

@@ -39,6 +39,7 @@ def movement(previous: Voicing, current: Voicing) -> int:
   return sum(abs(a.fret - b.fret) for a, b in zip(previous, current)) + abs(previous.bass.string_number - current.bass.string_number)
 
 class Cost(typing.NamedTuple):
+  extended_grips: int = 0
   travel: int = 0
   missing_tones: int = 0
 
@@ -52,7 +53,7 @@ def advance(options: tuple[Voicing, ...], requirements: generator.fretboard.Chor
   result = []
   for voicing in options:
     missing = len(set(requirements.allowed) - {p.midi % 12 for p in voicing})
-    cost, index = min((Cost(p.cost.travel + (movement(p.voicing, voicing) if p.voicing else 0), p.cost.missing_tones + missing), i) for i, p in enumerate(states))
+    cost, index = min((Cost(p.cost.extended_grips + generator.fretboard.span_penalty(voicing), p.cost.travel + (movement(p.voicing, voicing) if p.voicing else 0), p.cost.missing_tones + missing), i) for i, p in enumerate(states))
     result.append(Placement(cost, voicing, states[index]))
   return result