Sepearate Generation

generator/solo/profiles.py

@@ -5,6 +5,7 @@ import dataclasses
 from fractions import Fraction as F
 
 import generator.fretboard
+import generator.vocabulary
 
 
 @dataclasses.dataclass(frozen=True)
@@ -23,7 +24,7 @@ class Instrument:
     return any(p.string_number in self.strings for p in generator.fretboard.single_positions_for_pitch(F(number)))
 
   def cost(self, number):
-    return min(1., max(0, abs(number - self.reference) - 4) / 12) if self.reference is not None else 0.
+    return .5 * min(1., max(0, abs(number - self.reference) - 7) / 12) if self.reference is not None else 0.
 
 
 UNRESTRICTED = Instrument()
@@ -43,13 +44,13 @@ def weighted_center(notes):
 def for_part(part, analysis=None):
   if part not in ('acoustic', 'electric'):
     raise ValueError('unknown solo instrument: ' + part)
-  strings = (2, 3, 4, 5, 6) if part == 'acoustic' else (1, 2, 3, 4)
+  strings = (1, 2, 3, 4, 5, 6)
   if analysis is None or not analysis.melody:
     return Instrument(part, strings)
   # Analysis contains the prepared concert source. Electric melody is written
   # two octaves up and sounds one down (parts.build_measure), hence +12.
   # Use the source voice, never the highest added harmonization voice.
-  shift = 12 if part == 'electric' else 0
+  shift = generator.vocabulary.role(part + '_solo').get('register_offset', 12 if part == 'electric' else 0)
   notes = tuple(n for n in analysis.melody if n.end > analysis.body_offset)
   return Instrument(part, strings, weighted_center(notes) + shift,
     (min(n.pitch.number() for n in notes) + shift, max(n.pitch.number() for n in notes) + shift))