mir-evaluation · craffel · May 13, 2024 · Apr 1, 2024 · Apr 4, 2024 · Apr 1, 2024
diff --git a/mir_eval/display.py b/mir_eval/display.py
diff --git a/mir_eval/sonify.py b/mir_eval/sonify.py
@@ -224,7 +224,7 @@ def pitch_contour(
         time indices for each frequency measurement, in seconds
     frequencies : np.ndarray
         frequency measurements, in Hz.
-        Non-positive measurements will be interpreted as un-voiced samples.
+        Non-positive measurements or NaNs will be interpreted as un-voiced samples.
     fs : int
         desired sampling rate of the output signal
     amplitudes : np.ndarray
@@ -252,6 +252,8 @@ def pitch_contour(
     # Squash the negative frequencies.
     # wave(0) = 0, so clipping here will un-voice the corresponding instants
     frequencies = np.maximum(frequencies, 0.0)
+    # Convert nans to zeros to unvoice
+    frequencies = np.nan_to_num(frequencies, copy=False)
 
     # Build a frequency interpolator
     f_interp = interp1d(

diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [tool:pytest]
-addopts = --cov-report term-missing --cov mir_eval --cov-report=xml
+addopts = --cov-report term-missing --cov mir_eval --cov-report=xml --mpl --mpl-baseline-path=baseline_images/test_display
 
 [pydocstyle]
 # convention = numpy

diff --git a/tests/baseline_images/test_display/events.png b/tests/baseline_images/test_display/events.png
diff --git a/tests/baseline_images/test_display/hierarchy_label.png b/tests/baseline_images/test_display/hierarchy_label.png
diff --git a/tests/baseline_images/test_display/hierarchy_nolabel.png b/tests/baseline_images/test_display/hierarchy_nolabel.png
diff --git a/tests/baseline_images/test_display/labeled_events.png b/tests/baseline_images/test_display/labeled_events.png
diff --git a/tests/baseline_images/test_display/labeled_intervals.png b/tests/baseline_images/test_display/labeled_intervals.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare.png b/tests/baseline_images/test_display/labeled_intervals_compare.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare_common.png b/tests/baseline_images/test_display/labeled_intervals_compare_common.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare_noextend.png b/tests/baseline_images/test_display/labeled_intervals_compare_noextend.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_noextend.png b/tests/baseline_images/test_display/labeled_intervals_noextend.png
diff --git a/tests/baseline_images/test_display/multipitch_hz_unvoiced.png b/tests/baseline_images/test_display/multipitch_hz_unvoiced.png
diff --git a/tests/baseline_images/test_display/multipitch_hz_voiced.png b/tests/baseline_images/test_display/multipitch_hz_voiced.png
diff --git a/tests/baseline_images/test_display/multipitch_midi.png b/tests/baseline_images/test_display/multipitch_midi.png
diff --git a/tests/baseline_images/test_display/piano_roll.png b/tests/baseline_images/test_display/piano_roll.png
diff --git a/tests/baseline_images/test_display/piano_roll_midi.png b/tests/baseline_images/test_display/piano_roll_midi.png
diff --git a/tests/baseline_images/test_display/pitch_hz.png b/tests/baseline_images/test_display/pitch_hz.png
diff --git a/tests/baseline_images/test_display/pitch_midi.png b/tests/baseline_images/test_display/pitch_midi.png
diff --git a/tests/baseline_images/test_display/pitch_midi_hz.png b/tests/baseline_images/test_display/pitch_midi_hz.png
diff --git a/tests/baseline_images/test_display/segment.png b/tests/baseline_images/test_display/segment.png
diff --git a/tests/baseline_images/test_display/segment_text.png b/tests/baseline_images/test_display/segment_text.png
diff --git a/tests/baseline_images/test_display/separation.png b/tests/baseline_images/test_display/separation.png
diff --git a/tests/baseline_images/test_display/separation_label.png b/tests/baseline_images/test_display/separation_label.png
diff --git a/tests/baseline_images/test_display/test_display_events.png b/tests/baseline_images/test_display/test_display_events.png
diff --git a/tests/baseline_images/test_display/test_display_hierarchy_label.png b/tests/baseline_images/test_display/test_display_hierarchy_label.png
diff --git a/tests/baseline_images/test_display/test_display_hierarchy_nolabel.png b/tests/baseline_images/test_display/test_display_hierarchy_nolabel.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_events.png b/tests/baseline_images/test_display/test_display_labeled_events.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals.png b/tests/baseline_images/test_display/test_display_labeled_intervals.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals_compare.png b/tests/baseline_images/test_display/test_display_labeled_intervals_compare.png
diff --git a/.../baseline_images/test_display/test_display_labeled_intervals_compare_common.png b/.../baseline_images/test_display/test_display_labeled_intervals_compare_common.png
diff --git a/...aseline_images/test_display/test_display_labeled_intervals_compare_noextend.png b/...aseline_images/test_display/test_display_labeled_intervals_compare_noextend.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals_noextend.png b/tests/baseline_images/test_display/test_display_labeled_intervals_noextend.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_hz_unvoiced.png b/tests/baseline_images/test_display/test_display_multipitch_hz_unvoiced.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_hz_voiced.png b/tests/baseline_images/test_display/test_display_multipitch_hz_voiced.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_midi.png b/tests/baseline_images/test_display/test_display_multipitch_midi.png
diff --git a/tests/baseline_images/test_display/test_display_piano_roll.png b/tests/baseline_images/test_display/test_display_piano_roll.png
diff --git a/tests/baseline_images/test_display/test_display_piano_roll_midi.png b/tests/baseline_images/test_display/test_display_piano_roll_midi.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_hz.png b/tests/baseline_images/test_display/test_display_pitch_hz.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_midi.png b/tests/baseline_images/test_display/test_display_pitch_midi.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_midi_hz.png b/tests/baseline_images/test_display/test_display_pitch_midi_hz.png
diff --git a/tests/baseline_images/test_display/test_display_segment.png b/tests/baseline_images/test_display/test_display_segment.png
diff --git a/tests/baseline_images/test_display/test_display_segment_text.png b/tests/baseline_images/test_display/test_display_segment_text.png
diff --git a/tests/baseline_images/test_display/test_display_separation.png b/tests/baseline_images/test_display/test_display_separation.png
diff --git a/tests/baseline_images/test_display/test_display_separation_label.png b/tests/baseline_images/test_display/test_display_separation_label.png
diff --git a/tests/baseline_images/test_display/test_display_ticker_midi_zoom.png b/tests/baseline_images/test_display/test_display_ticker_midi_zoom.png
diff --git a/tests/baseline_images/test_display/ticker_midi_zoom.png b/tests/baseline_images/test_display/ticker_midi_zoom.png