Validation

generator/training_io.py

@@ -71,9 +71,6 @@ def read(path, role, form_start=None, pitch_convention='encoded'):
   # Do not run the strict score importer over these references: annotations,
   # unusual timing and high encoded pitches are evidence, not repair requests.
   from generator import harmony, model, fretboard
-  def semantic(h):
-    return {'root':{'letter':h['root'].lower(),'alter':model.rational(F(h['alter']))},'kind':h['kind'],
-      'degrees':[{'value':int(d['value']),'alter':model.rational(F(d['alter'])),'type':d['type']} for d in h['degrees']]}
   for event in result['notes']:
     if not event['pitch']:continue
     p=event['pitch'];number=12*(p['octave']+1)+model.NATURAL[p['step'].lower()]+F(p['alter'])
@@ -89,7 +86,7 @@ def read(path, role, form_start=None, pitch_convention='encoded'):
       info={'start':str(a),'end':str(b),'chord':current,'chord_degrees':[]}
       if current and current['root']:
         try:
-          chord=semantic(current);root=model.NATURAL[chord['root']['letter']]+F(current['alter'])
+          chord=harmony.parse_symbol(training_chord(current));root=model.NATURAL[chord['root']['letter']]+model.alteration(chord['root']['alter'])
           info['chord_degrees']=[d for d,alter in harmony.degrees(chord).items() if (root+harmony.degree_semitones(d,alter)-number)%12==0]
           info['root_relative_semitones']=str((number-root)%12)
           info['spelled_simple_degree']=(model.LETTERS.index(p['step'].lower())-model.LETTERS.index(chord['root']['letter']))%7+1