Sepearate Generation

generator/solo/leads.py

@@ -7,10 +7,12 @@ from __future__ import annotations
 
 import dataclasses
 import fractions
+import functools
+import generator.vocabulary
 
 import generator.model
 import generator.fretboard
-from generator.solo import types, harmonic, policy, placement, routes, sequences, drafts, references, profiles
+from generator.solo import types, harmonic, policy, placement, routes, sequences, drafts, features as references, profiles
 
 F = fractions.Fraction
 
@@ -133,10 +135,10 @@ def rhythm_catalog(library, meter):
   return drafts.catalog(library,meter)
 
 
-def connection_patterns(start,end,entry,destination,rhythms,meter):
-  length=end-start
+@functools.lru_cache(maxsize=256)
+def connection_windows(catalog,length):
   spans={( (F(),length), ):'held'}
-  for identifier,pattern,total in rhythm_catalog(rhythms,meter):
+  for identifier,pattern,total in catalog:
     if total < length:
       continue
     # Retrieve every exact-duration window, including offbeat and cross-bar windows.
@@ -151,6 +153,10 @@ def connection_patterns(start,end,entry,destination,rhythms,meter):
   ranked=sequences.diverse(tuple(spans.items()),
     lambda item:(abs(len(item[0])-float(length)*1.5),item[1]),
     lambda item:(len(item[0]),any(a[1]!=b[0] for a,b in zip(item[0],item[0][1:]))),8)
+  return ranked
+
+def connection_patterns(start,end,entry,destination,rhythms,meter):
+  ranked=connection_windows(tuple(rhythm_catalog(rhythms,meter)),end-start)
   result=[]
   for pattern,identifier in ranked:
     events=tuple(dataclasses.replace(entry,start=start+a,end=start+b,role='connection',
@@ -323,9 +329,10 @@ def transition(first,second):
 def thematic_options(analysis,measures,part,end,choices,library,rhythms,context,stage):
   from generator.solo import realization,themes,phrasing
   context.resources[id(library)]=library
+  context.tempo=analysis.tempo
   context.resources[id(rhythms)]=rhythms
   harmony=harmonic.Harmony(choices, profiles.for_part(part,analysis))
-  seed=policy.stable_rank('source_variations',(analysis.melody,choices,policy.SEED_NAMESPACE))
+  seed=policy.stable_rank('source_variations',(part,analysis.melody,choices,generator.vocabulary.role(part+'_solo'),policy.DEFAULT.composition_version))
   states=[(0.,())]
   failures=[]
   for _ in range(2*len(measures)+1):
@@ -372,10 +379,6 @@ def thematic_options(analysis,measures,part,end,choices,library,rhythms,context,
     def rank(value):
       cost,history=value;state=history[-1].state;elapsed=history[-1].plan.end
       musical=cost/max(.001,float(elapsed/end))
-      if elapsed==end:
-        target=policy.DEFAULT.settling_target*float(end)/(32*4)
-        musical+=.1*max(0,abs(state.closures-target)-1)
-        musical+=.15*abs(len(state.returns)-policy.DEFAULT.return_target*float(end)/(32*4))
       return musical,policy.stable_rank(seed,tuple(p.draft.id for p in history))
     states=sequences.diverse(following,rank,
       lambda v:(v[1][-1].state.home.id if v[1][-1].state.home else '',v[1][-1].plan.end,len(v[1][-1].state.returns)),policy.DEFAULT.chorus_frontier)