Cleanup

generator/solo/expressions.py

@@ -63,17 +63,22 @@ def validate(notes,contracts,harmony):
       return {},c.id+': missing or changed expression event/target'
     if c.preparation and not same(c.preparation):return {},c.id+': changed preparation'
     if any(n.event_id in approved for n in c.events):return {},c.id+': overlapping expression permissions'
-    target=c.target; span=harmony.at(c.boundary if c.kind=='anticipation' else target.start)
+    target=c.target; span=harmony.at(c.boundary if c.boundary is not None else target.start)
     if not span or not span.scale or span.chord!=c.chord:return {},c.id+': wrong target harmony'
     if c.kind in ('approach','enclosure','connection'):
       rule=next((r for r in vocabulary.data('lead_ins')['patterns'] if r['id']==c.rule and r['kind']==c.kind),None)
       if not rule or len(c.events)!=len(rule['semitones']):return {},c.id+': unknown approach formula'
-      if target.pitch.number()%12 not in harmony.members(target.start,target.end) or target.pitch.number()%12 not in types.permitted(harmony.choices,target.start,target.end):return {},c.id+': invalid destination hold'
+      arrival=c.boundary if c.boundary is not None else target.start
+      if c.boundary is not None and not any(a.kind=='anticipation' and a.target==target and a.boundary==c.boundary for a in contracts):return {},c.id+': future target lacks anticipation contract'
+      if target.pitch.number()%12 not in harmony.members(arrival,target.end) or target.pitch.number()%12 not in types.permitted(harmony.choices,arrival,target.end):return {},c.id+': invalid destination hold'
       gap=F(rule['gap']);cursor=target.start-gap-sum((F(d) for d in rule['durations']),F())
       if target.start-cursor>F(vocabulary.data('lead_ins')['max_approach']):return {},c.id+': approach too long'
       for n,step,duration in zip(c.events,rule['semitones'],rule['durations']):
         if n.start!=cursor or n.end!=cursor+F(duration) or n.pitch.number()!=target.pitch.number()+step:return {},c.id+': wrong register, interval, or timing'
         cursor=n.end
+      for index in rule.get('mapped_indices',[]):
+        n=c.events[index]
+        if n.pitch.number()%12 not in types.permitted(harmony.choices,n.start,n.end):return {},c.id+': declared diatonic neighbor is outside the mapped collection'
       if any(n.start<c.target.start and n.end>c.events[0].start and n.event_id not in {e.event_id for e in c.events} for n in notes):return {},c.id+': interrupted approach'
       if c.kind=='connection' and (not c.preparation or c.preparation.end!=c.events[0].start or abs(c.preparation.pitch.number()-c.events[0].pitch.number())>2):return {},c.id+': chromatic connection lacks its incoming motion'
     elif c.kind=='color':
@@ -88,7 +93,7 @@ def validate(notes,contracts,harmony):
           if not rule['outside'] and n.pitch.number()%12 not in region.scale.pitches:return {},c.id+': color requires mapped collection'
       last=c.events[-1]
       if rule.get('resolve'):
-        if target is last or not 0<=target.start-last.end<=F(vocabulary.data('harmony')['resolution_gap']) or not 0<abs(target.pitch.number()-last.pitch.number())<=2 or target.pitch.number()%12 not in harmony.members(target.start,target.end):return {},c.id+': unresolved color'
+        if target.event_id==last.event_id or not 0<=target.start-last.end<=F(vocabulary.data('harmony')['resolution_gap']) or not 0<abs(target.pitch.number()-last.pitch.number())<=2 or target.pitch.number()%12 not in harmony.members(target.start,target.end):return {},c.id+': unresolved color'
     elif c.kind=='suspension':
       rule=next((r for r in vocabulary.data('harmony').get('suspensions',[]) if r['id']==c.rule),None)
       if not rule or len(c.events)!=1 or c.boundary is None:return {},c.id+': unsupported suspension'
@@ -232,7 +237,7 @@ def joint_candidates(phrases,incoming,harmony,tempo,context,*,bar=F(4)):
         counts['rejected_by_rule']+=1;continue
       if not drafts.contract_valid(phrase.draft,actual)[0]:
         counts['rejected_by_rule']+=1;continue
-      checked=harmony.evaluate(actual,until=phrase.plan.end,complete=True,expressions=(c,))
+      checked=harmony.evaluate(actual,until=phrase.plan.end,complete=True,expressions=(*phrase.draft.expressions,c))
       if not checked.valid:
         counts['rejected_by_rule']+=1;continue
       counts['valid']+=1
@@ -249,7 +254,7 @@ def joint_candidates(phrases,incoming,harmony,tempo,context,*,bar=F(4)):
         rhythm=tuple((n.start-t.start,n.end-t.start) for n in actual if t.start<=n.start<t.end))
         for t in phrase.draft.transformations)
       changed=dataclasses.replace(phrase.draft,id=phrase.draft.id+':'+c.rule,
-        notes=actual,expressions=(c,),transformations=transforms)
+        notes=actual,expressions=(*phrase.draft.expressions,c),transformations=transforms)
       candidate=realization.checked_phrase(phrase.plan,changed,actual,incoming.treatments,incoming,harmony,tempo,phrase.edits)
       if candidate is None:continue
       trace[c.kind]['retained']+=1
@@ -304,7 +309,7 @@ def refine(solo,enabled=True):
           events=tuple(n.event_id for n in actual if t.start<=n.start<t.end),
           rhythm=tuple((n.start-t.start,n.end-t.start) for n in actual if t.start<=n.start<t.end))
           for t in draft.transformations)
-        changed=dataclasses.replace(draft,notes=actual,expressions=(c,),transformations=transforms)
+        changed=dataclasses.replace(draft,notes=actual,expressions=(*phrase.draft.expressions,c),transformations=transforms)
         routes=tuple(r for r in phrase.routes if all(any((n.event_id,n.start,n.end,n.pitch)==(a.event_id,a.start,a.end,a.pitch) for a in actual) for n in r.notes))
         options.append((cost,dataclasses.replace(phrase,draft=changed,decisions=decisions,routes=routes),c))
     _,chosen,c=min(options,key=lambda v:(round(v[0],8),policy.stable_rank(seed,(phrase.plan.id,v[2]))))