Soloing

generator/solo/scoring.py

@@ -10,8 +10,8 @@ def passages(plan):
   if plan.passages:
     return plan.passages
   end = plan.end - plan.release
-  active = (generator.solo.types.Passage(plan.start, end, 'active', plan.activity, fractions.Fraction(3, 4)),) if end > plan.start else ()
-  return active + ((generator.solo.types.Passage(end, plan.end, 'space', fractions.Fraction(), fractions.Fraction()),) if plan.release else ())
+  active = (generator.solo.types.ActivitySpan(plan.start, end, 'active', plan.activity, fractions.Fraction(3, 4)),) if end > plan.start else ()
+  return active + ((generator.solo.types.ActivitySpan(end, plan.end, 'space', fractions.Fraction(), fractions.Fraction()),) if plan.release else ())
 
 def intervals(choices, start, end):
   return tuple((max(start, c.span.start), min(end, c.span.end)) for c in choices if c.scale and c.span.start < end and c.span.end > start)
@@ -23,12 +23,14 @@ def corridor(pitch, low, high):
   return max(low - pitch, 0, pitch - high)
 
 def motif_fidelity(notes, motif, treatment):
-  if treatment in ('quote', 'exact_quote', 'rhythmic_reference'):
+  if treatment in ('quote', 'exact_quote'):
     return 0.0
+  if treatment == 'rhythmic_reference':
+    return 1.0 if len(notes) < min(2, len(motif.notes)) else 0.0
   actual = tuple(b.pitch.number() - a.pitch.number() for a, b in zip(notes, notes[1:]))
   expected = motif.contour()
   if not actual or not expected:
-    return 0.0 if len(notes) >= min(1, len(motif.notes)) else 1.0
+    return 0.0 if len(notes) == len(motif.notes) == 1 else 1.0
   count = min(2, len(actual), len(expected)) if treatment == 'opening_reference' else max(1, len(actual) // 2) if treatment == 'answer' else len(actual)
   errors = []
   for index in range(count):
@@ -36,7 +38,8 @@ def motif_fidelity(notes, motif, treatment):
     motion = actual[index]
     direction = ((reference > 0) - (reference < 0)) != ((motion > 0) - (motion < 0))
     errors.append(0.75 * direction + 0.25 * min(1, abs(motion - reference) / 12))
-  return sum(errors) / len(errors)
+  evidence = min(2, len(expected))
+  return max(sum(errors) / len(errors), max(0, evidence - len(actual)) / evidence)
 
 class Evaluation:
   """Prepare fixed harmonic windows once; only soft penalties use float time."""