Cleanup

audition/solo_compare.py

@@ -95,8 +95,23 @@ def compare(generated,reference):
     'reference_playability':playability(reference),'reference_original':reference}
 
 
+def gesture_coverage(raw):
+  """Group timing-only retained-unit labels with their direct construction.
+
+  The source label can include rhythm edits such as '; diminution'. These
+  describe direct candidates, not additional harmonic proposal families.
+  Raw generation evidence remains untouched in the manifest.
+  """
+  result={}
+  for label,counts in raw.items():
+    purpose=label if label.startswith(('direct','harmonic_arrival:','sustained_color')) else 'direct'
+    target=result.setdefault(purpose,dict.fromkeys(('proposed','retained_jobs','valid_routes','retained_units'),0))
+    for name,value in counts.items():target[name]+=value
+  return result
+
+
 def render_events(notes, duration, tempo, root, cache):
-  """The same neutral note envelopes as production_review; no expression edits."""
+  """Use the production neutral note envelopes; no expression edits."""
   from generator import playback
   factor=F(60*playback.SAMPLE_RATE)/tempo
   output=array.array('f',[0])* (round(duration*factor)+2400)
@@ -187,12 +202,22 @@ def run(generated_dir,reference_paths,starts,pitch_convention,output,assets=None
   rows=['<!doctype html><meta charset="utf-8"><title>Solo comparison</title>',
     '<style>body{font:16px system-ui;max-width:1100px;margin:2rem auto}td,th{padding:.5rem;text-align:left}pre{white-space:pre-wrap}</style>',
     '<h1>Completed solos and reference scores</h1><p>Differences are diagnostic. These files do not supply generation inputs or candidate scores. No listening verdict is claimed.</p>',
-    '<p><a href="comparison.json">Exact timing, notes, harmony, annotations, placement, and phrase reports</a></p>']
+    '<p><a href="comparison.json">Exact timing, notes, harmony, annotations, placement, and phrase reports</a> · <a href="analysis/theory.md">Complete musical relationship review</a></p>']
   for role,r in result['solos'].items():
     actual_path=generated_dir/manifest['solos'][role]['file']
     reference_path=Path(reference_paths[role])
-    rows += ['<h2>'+html.escape(role)+'</h2>',f'<p>{r["exact_matching_attacks"]} exactly matching attacks; {len(r["differences"])} differing onset positions. This is not a musical-quality score.</p>',
+    rows += ['<h2>'+html.escape(role)+'</h2>',f'<p>Exact event match: <strong>{"yes" if r["exact_musical_match"] else "no"}</strong>. {r["exact_matching_attacks"]} exactly matching attacks; {len(r["differences"])} differing onset positions. This is not a musical-quality score.</p>',
       '<p><a href="'+html.escape(os.path.relpath(actual_path,output))+'">Generated MusicXML</a> · <a href="'+html.escape(os.path.relpath(reference_path,output))+'">Untouched reference MusicXML</a></p>']
+    selected=collections.Counter(c['kind'] for c in r['production_phrases'].get('expressions',[]))
+    rows.append('<p>Selected, validated production treatments: '+html.escape(str(dict(selected)))+'. Ordinary mapped material remains separate.</p>')
+    if r.get('reference_events_after_production_end'):
+      rows.append('<p>Reference material extends beyond the production vocal-protection window: '+str(len(r['reference_events_after_production_end']))+' events. The reference and vocal timing remain unchanged.</p>')
+    funnel=gesture_coverage(r['production_phrases'].get('selection_trace',{}).get('joint_gestures',{}))
+    if funnel:
+      rows.append('<details><summary>Construction coverage (not similarity scoring)</summary><table><tr><th>Purpose</th><th>Proposed structures</th><th>Retained jobs</th><th>Valid routes</th><th>Retained units</th></tr>')
+      for purpose,counts in sorted(funnel.items()):
+        rows.append('<tr><td>'+html.escape(purpose)+'</td>'+''.join('<td>'+str(counts[k])+'</td>' for k in ('proposed','retained_jobs','valid_routes','retained_units'))+'</tr>')
+      rows.append('</table></details>')
     for clip in r.get('audition',{}).get('clips',[]):
       rows.append('<p>'+html.escape(clip['version']+' / '+clip['context'])+'<br><audio controls preload="none" src="'+html.escape(clip['file'])+'"></audio></p>')
     rows.append('<details><summary>Exact note differences</summary><table><tr><th>Beat relative to form</th><th>Generated</th><th>Reference</th></tr>')