Sepearate Generation

generator/solo/drafts.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import dataclasses
 import fractions
+import functools
 
 import generator.model
 import generator.solo.harmonic
@@ -14,7 +15,7 @@ import generator.solo.policy
 import generator.solo.scoring
 import generator.solo.sequences
 import generator.solo.types
-import generator.solo.references
+import generator.solo.features
 
 F = fractions.Fraction
 
@@ -47,9 +48,13 @@ class RhythmDraft:
   octave: int = 0
 
 def catalog(library, meter):
+  return _catalog(library.for_meter(meter))
+
+@functools.lru_cache(maxsize=32)
+def _catalog(snippets):
   """Read complete snippets; ties across authored bars stay one attack."""
   result = {}
-  for snippet in library.for_meter(meter):
+  for snippet in snippets:
     offset, spans = F(), []
     for bar in snippet.bars:
       for event in bar.events:
@@ -370,7 +375,7 @@ def contract_valid(draft, notes):
     if 'opening_contour' in transform.preserves and directions != transform.directions[:len(directions)]:
       return False, f'{transform.id}: identifying contour changed'
   for feature in draft.features:
-    if generator.solo.references.feature_error(feature, local_sounding(notes)):
+    if generator.solo.features.feature_error(feature, local_sounding(notes)):
       return False, f'{feature.id}: selected identifying relationship changed'
   for first, repeated in draft.correspondence:
     if first not in by_id or repeated not in by_id:
@@ -389,7 +394,7 @@ def relationship_features(draft, notes):
     direction.extend(a != b for a, b in zip(actual, transform.directions))
     reference = draft.reference_motif if transform.operation in ('statement', 'contrast') else draft.home
     if reference and not draft.lead_identity and not draft.source_phrase and transform.operation not in ('close', 'fragment', 'broaden_ending'):
-      development.append(generator.solo.references.relationship(group, reference))
+      development.append(generator.solo.features.relationship(group, reference))
   joins = []
   for time in draft.joins:
     left = next((n for n in reversed(notes) if n.start < time), None)