Cleanup

generator/solo/report.py

@@ -25,16 +25,18 @@ def structure(solo):
     phrases.append(entry)
     if anchor:endings.append({'phrase':p.id,'effect':p.ending,'arrival':str(anchor.earliest),'pitch':anchor.pitch.label(),'required_beats':str(anchor.duration),'completed':completed})
   ns=solo.notes()
+  duration=solo.end-solo.start
   return {'schema':'composer-report-3','selection_trace':plain({k:v for k,v in solo.diagnostics.items() if not k.endswith('_seconds')}),
     'instrument_profile':plain(solo.profile),'phrases':phrases,'expressions':plain(contracts),'fretboard':fretboard_report(solo),
-    'phrasing':{'endings':endings,'attacks':len(ns),'attacks_per_four_beats':4*len(ns)/float(solo.end) if solo.end else 0,
-      'occupancy':sum(float(n.end-n.start) for n in ns)/float(solo.end) if solo.end else 0},
+    'phrasing':{'endings':endings,'attacks':len(ns),'allocation_beats':str(duration),
+      'attacks_per_four_beats':4*len(ns)/float(duration) if duration else 0,
+      'occupancy':sum(float(n.end-n.start) for n in ns)/float(duration) if duration else 0},
     'harmonic_roles':harmony.describe(ns,expressions=contracts),'harmonic_valid':checked.valid,'harmonic_error':checked.error,
     'harmonic_exposure':checked.exposure,'unresolved_treatments':plain(checked.pending)}
 
 def describe(solo,scales,measure_offset=0,time_offset=0,*,detail=None):
   detail=detail or structure(solo)
-  lines=[f'Independent complete-phrase solo: {solo.part}', 'Times are exact quarter beats from the solo start; pitches sound one octave below guitar notation.',
+  lines=[f'Independent joint-action solo: {solo.part}', 'Times are exact quarter beats from the chorus start; negative times are allocated lead-ins. Pitches sound one octave below guitar notation.',
     'Approximate fingering costs are not a biomechanical guarantee.',json.dumps(detail['phrasing'])]
   for p in solo.phrases:
     lines.append(f'{p.id}: {p.start}–{p.end}; {p.purpose}, {p.direction}, {p.ending}; theme {p.theme}; score {p.score:.4f}')