Cleanup

tests/solo_fixtures.py

@@ -1,6 +1,6 @@
 import copy, fractions
 import generator.model, generator.parts, generator.harmony
-import generator.solo.analysis, generator.solo.composer, generator.solo.types
+import generator.source, generator.solo.composer, generator.solo.types
 import tests.test_musicxml
 import generator.harmonic_time
 
@@ -20,7 +20,7 @@ def song(meter=4, count=6, chords=('Dm7', 'G7', 'CM7')):
   return generator.parts.prepare_document(document)
 
 def compose(document, part='acoustic', cutoff=None):
-  analysis = generator.solo.analysis.analyze(document)
+  analysis = generator.source.analyze(document)
   measures = document['staves'][0]['measures']
   end = sum(generator.model.fraction(m['duration']) for m in measures) if cutoff is None else cutoff
   return generator.solo.composer.compose(analysis, measures, part, end)