Soloing

generator/solo/harmonic.py

@@ -49,7 +49,9 @@ class Result:
   error: str = ''
 
 class Harmony:
-  def __init__(self, choices):
+  def __init__(self, choices, profile=None):
+    from generator.solo.profiles import UNRESTRICTED
+    self.profile = profile or UNRESTRICTED
     self.choices = choices
     self.spans = tuple(Span(c.span.start, c.span.end, roles(c.span.chord), c.scale, generator.harmony.symbol(c.span.chord) if c.span.chord else 'N.C.') for c in choices)
     self._at = {}
@@ -110,7 +112,8 @@ class Harmony:
         actual = events.get(expected.event_id)
         if not actual or (actual.start, actual.end, actual.pitch) != (expected.start, expected.end, expected.pitch):
           return {}, contract.id + ': missing or changed enclosure event ' + expected.event_id
-      if upper.end-upper.start != fractions.Fraction(1,2) or lower.end-lower.start != fractions.Fraction(1,2) or upper.end != lower.start or lower.end != target.start:
+      approach_start = contract.approach_start if contract.approach_start is not None else upper.start
+      if not upper.start <= approach_start or upper.end-approach_start != fractions.Fraction(1,2) or lower.end-lower.start != fractions.Fraction(1,2) or upper.end != lower.start or lower.end != target.start:
         return {}, contract.id + ': enclosure must be two contiguous eighths immediately before its target'
       if not 0 < upper.pitch.number()-target.pitch.number() <= 3 or lower.pitch.number() != target.pitch.number()-1:
         return {}, contract.id + ': enclosure does not surround the exact target register'
@@ -192,7 +195,8 @@ class Harmony:
           return Result(False, 0, error=f'{note.pitch.label()} at {start}-{end}: outside mapped collection or missing harmony')
         covered = end
         function = self.function(number, span)
-        if function == 'basic' or note.role == 'quote' or enclosure:
+        brief_enclosure = enclosure and (exception or enclosure.approach_start is None or enclosure.approach_start == note.start)
+        if function == 'basic' or note.role == 'quote' or brief_enclosure:
           continue
         if duration >= generator.solo.policy.DEFAULT.long_note and contract is None:
           return Result(False, 0, error=f'{note.pitch.label()} at {start}-{end} over {span.chord}: sustained {function} without a planned treatment')