Generation

generator/arrange/generate.py

@@ -7,6 +7,7 @@ import pathlib
 import generator.accompaniment
 import generator.arrange.form
 import generator.guitar
+import generator.melody
 import generator.model
 import generator.musicxml
 import generator.parts
@@ -62,8 +63,8 @@ def _arrange_document(document: dict, part_type: str, plans: dict[int, generator
       rhythm = None
       if section.role == 'accompaniment':
         plan = plans[section.section_index]
-        rhythm = (plan.acoustic if part_type == 'acoustic' else plan.electric)[len(segment)]
-      result = generator.parts.build_measure(m, f'measure-{len(output) + len(segment) + 1}', section.role, part_type, previous[si], section.label if not segment else '', rhythm)
+        rhythm = (plan.acoustic_bass[len(segment)], plan.acoustic_upper[len(segment)]) if part_type == 'acoustic' else plan.electric[len(segment)]
+      result = generator.parts.build_measure(m, f'measure-{len(output) + len(segment) + 1}', section.role, part_type, previous[si], section.label if not segment else '', rhythm, melody_octave=True)
       segment.append(result)
     identity_segment = segment
     segment_length = sum((generator.model.fraction(m['duration']) for m in segment), fractions.Fraction())
@@ -112,6 +113,8 @@ def _arrange_document(document: dict, part_type: str, plans: dict[int, generator
   result = generator.score.make_arranged_document(document, staff, staff_id='staff-arranged-' + part_type, staff_name=part_type.capitalize(), role='vocal' if part_type == 'vocal' else 'guitar', arrangement_part_type=part_type, measures=output, tuplets=tuplets, octave_shifts=octave_shifts)
   result['metadata'].setdefault('tempo', 124)
   if part_type != 'vocal':
+    generator.accompaniment.prepare_basses(result)
+    generator.melody.harmonize(result)
     generator.guitar.place_guitar(result)
     if generator.accompaniment.connect_continuations(result):
       generator.guitar.place_guitar(result)