Chord Families

generator/comping.py

@@ -8,6 +8,7 @@ import fractions
 
 import generator.accompaniment
 import generator.comping_rhythm
+import generator.chord_families
 import generator.acoustic_voicing
 import generator.arrange.form
 import generator.fretboard
@@ -67,9 +68,10 @@ def local_cost(part, key, grip, center):
   register = abs(fractions.Fraction(sum(p.midi for p in grip), len(grip)) - center)
   if part == 'electric':
     value = generator.guitar.voicing_cost(grip, 'electric', required.allowed)
-    return (value.string_shortfall, value.effort, value.missing_tones, register)
-  # As in acoustic harmony-span placement: travel first, then completeness.
-  return (0, 0, len(set(required.allowed) - {p.midi % 12 for p in grip}), register)
+    return (3 * value.string_shortfall + value.family_penalty, value.effort, value.missing_tones, register)
+  # Familiar degree orders on either bass string, then whole-form movement.
+  family = generator.chord_families.acoustic(json.loads(key), grip)
+  return (int(not family['preferred']), 0, len(set(required.allowed) - {p.midi % 12 for p in grip}), register)
 
 def select_grips(layers, costs, part, seed, *, left=(), right=(), close=False):
   """Exact small-state dynamic programming; never prune by hand center.
@@ -146,7 +148,8 @@ class Canonical:
       self.cache[self.key(source, prior, index)] = self.render(source, prior, index, spans, selected, previous, False)
       if selected:
         previous = selected[-1]
-    self.connect_holds(inputs)
+    if generator.vocabulary.accompaniment(part)['connect_holds']:
+      self.connect_holds(inputs)
   @property
   def report(self):
     return [row for key in sorted(self._reports, key=lambda k: (k[0], repr(k))) for row in self._reports[key]]
@@ -207,6 +210,8 @@ class Canonical:
       root = int(generator.model.NATURAL[span.chord['root']['letter']] + generator.model.alteration(span.chord['root']['alter']))
       rows.append({'source_index': index, 'onset': str(span.start), 'chord': generator.harmony.symbol(span.chord),
         'figure': span.figure, 'tones': len(grip), 'bass': bool(bass), 'variant': variant,
+        'family': (generator.chord_families.acoustic(span.chord, grip) if self.part == 'acoustic' else generator.chord_families.electric(grip)) if grip else None,
+        'family_coverage': generator.chord_families.coverage(span.chord, span.options, self.part),
         'positions': [{'string': p.string_number, 'fret': p.fret, 'sounding_midi': p.midi} for p in grip],
         'bass_degree': next((d for d, a in degrees.items() if bass and (root + generator.harmony.degree_semitones(d, a)) % 12 == bass.midi % 12), None),
         'bass_string': bass.string_number if bass else None,