Soloing

generator/solo/routes.py

@@ -33,7 +33,7 @@ def candidates(notes, fixed, harmony, library, register, relationship='connect t
     harmony.route_libraries={}
     harmony.concrete_routes={}
   harmony.route_libraries[id(library)]=library
-  concrete_key=(notes,frozenset(fixed),id(library),register)
+  concrete_key=(notes,frozenset(fixed),id(library),register,harmony.profile)
   if concrete_key in harmony.concrete_routes:
     return tuple(dataclasses.replace(r,relationship=relationship) for r in harmony.concrete_routes[concrete_key])
   # Event/source IDs and non-fixed placeholder pitches do not affect route
@@ -42,7 +42,7 @@ def candidates(notes, fixed, harmony, library, register, relationship='connect t
   fixed_indices=frozenset(i for i,n in enumerate(notes) if n.event_id in fixed)
   canonical=tuple(dataclasses.replace(n,sources=(),event_id=str(i),role='connection',position=None,
     pitch=n.pitch if i==0 or i==len(notes)-1 or i in fixed_indices else types.Pitch('c',fractions.Fraction(),0)) for i,n in enumerate(notes))
-  key=(canonical,fixed_indices,id(library),register)
+  key=(canonical,fixed_indices,id(library),register,harmony.profile)
   if key not in harmony.route_cache:
     harmony.route_cache[key]=_candidates(canonical,{str(i) for i in fixed_indices},harmony,library,register)
   result=[]
@@ -76,9 +76,9 @@ def _candidates(notes, fixed, harmony, library, register):
     types.permitted(harmony.choices,n.start,n.end),
     n.pitch.number() if n.event_id in fixed or i==len(notes)-1 else None) for i,n in enumerate(notes))
   if not hasattr(harmony,'pitch_routes'):harmony.pitch_routes={}
-  key=(first.pitch,contexts,id(library),register)
+  key=(first.pitch,contexts,id(library),register,harmony.profile)
   if key not in harmony.pitch_routes:
-    harmony.pitch_routes[key]=pitch_paths(first.pitch,contexts,library,register)
+    harmony.pitch_routes[key]=pitch_paths(first.pitch,contexts,library,register,harmony.profile)
     if len(harmony.pitch_routes)>8192:harmony.pitch_routes.pop(next(iter(harmony.pitch_routes)))
   route_spans=tuple((max(first.start,c.span.start),min(destination.end,c.span.end),c.scale.label())
     for c in harmony.choices if c.scale and c.span.start<destination.end and c.span.end>first.start)
@@ -91,12 +91,15 @@ def _candidates(notes, fixed, harmony, library, register):
   return tuple(result)
 
 
-def pitch_paths(first, contexts, library, register):
+def pitch_paths(first, contexts, library, register, profile=None):
   """Time-independent pitch work; context includes every overlapped collection.
 
   Sounding durations and chord roles are still validated on each concrete
   realization. Equal collection contexts can reuse paths across rhythmic edits.
   """
+  from generator.solo.profiles import UNRESTRICTED
+  profile = profile or UNRESTRICTED
+  if not profile.permits(first.number()): return ()
   destination=contexts[-1][2]
   try:
     displacement=types.scale_index(contexts[0][0],destination)-types.scale_index(contexts[0][0],first.number())
@@ -106,6 +109,7 @@ def pitch_paths(first, contexts, library, register):
   direction=(destination>first.number())-(destination<first.number())
   paths=dict.fromkeys(path for d in displacements for path in library.retrieve(len(contexts),d,direction))
   low,high=generator.fretboard.single_register((register[0]-7,register[1]+5))
+  low, high = max(low, profile.register[0]), min(high, profile.register[1])
   result=[]
   for path in paths:
     realized=[first]
@@ -116,7 +120,7 @@ def pitch_paths(first, contexts, library, register):
       pitch=options[0];number=pitch.number()
       if not low<=number<=high or number%12 not in allowed:break
       if fixed is not None and number!=fixed:break
-      if not generator.solo.placement.positions(number):break
+      if not generator.solo.placement.positions(number,profile):break
       realized.append(pitch)
     if len(realized)==len(contexts):result.append((tuple(realized),path.sources))
   return tuple(result)