Solo

generator/solo/arrangement.py

@@ -93,7 +93,8 @@ def apply(source, parts, *, rhythms, scales, sequences, solos=None, revise=True,
   head_first, head_count, _, _ = sections[2]
   head = parts['electric']['staves'][0]['measures'][head_first:head_first + head_count]
   reports = []
-  for section_index, part, other in ((3, 'acoustic', 'electric'), (4, 'electric', 'acoustic')):
+  requests = {}
+  for section_index, part in ((3, 'acoustic'), (4, 'electric')):
     first, count, offset, length = sections[section_index]
     initial = generator.accompaniment.carried_chords(parts[part]['staves'][0]['measures'])[first]
     template = copy.deepcopy(parts[part]['staves'][0]['measures'][first:first + count])
@@ -103,7 +104,12 @@ def apply(source, parts, *, rhythms, scales, sequences, solos=None, revise=True,
       sounding = [generator.model.fraction(n['onset']) for n in generator.score.measure_notes(pickup) if n['pitches']]
       if sounding:
         cutoff -= generator.model.fraction(pickup['duration']) - min(sounding)
-    solo = generator.solo.composer.compose(analysis, template, part, cutoff, scales=scales, sequences=sequences, rhythms=rhythms, initial=initial, revise=revise, references=references, stage=stage, context=(contexts or {}).get(part))
+    requests[part] = (template, cutoff, initial)
+  selected = generator.solo.composer.compose_pair(analysis, requests, scales=scales, sequences=sequences, rhythms=rhythms, contexts=contexts, stage=stage)
+  for solo, section_index, other in zip(selected, (3, 4), ('electric', 'acoustic')):
+    part = solo.part
+    first, count, offset, length = sections[section_index]
+    template, cutoff, initial = requests[part]
     if solos is not None:
       solos.append(solo)
     foreground = generator.solo.notation.measures(template, solo.notes(), 'solo_' + part)