Mercurial > hg > sonic-lineup
changeset 431:f45838051d29 pitch-align
Update to use note alignment in the internal version of the sung pitch aligner; some debug output in external version
| author | Chris Cannam |
|---|---|
| date | Fri, 29 May 2020 17:39:48 +0100 |
| parents | 3f0c55210f50 |
| children | 727e9bbdbd71 |
| files | main/MainWindow.cpp pitch-track-align/pitch-track-align.sml repoint-lock.json |
| diffstat | 3 files changed, 21 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/main/MainWindow.cpp Thu May 28 17:57:43 2020 +0100 +++ b/main/MainWindow.cpp Fri May 29 17:39:48 2020 +0100 @@ -792,7 +792,7 @@ { Align::TrimmedLinearAlignment, tr("Linear Trimmed") }, { Align::MATCHAlignment, tr("Online DTW (MATCH)") }, { Align::MATCHAlignmentWithPitchCompare, tr("Online DTW with Pitch Compensation") }, - { Align::SungPitchContourAlignment, tr("Sung Pitch Contour") }, + { Align::SungNoteContourAlignment, tr("Sung Note Contour") }, { Align::ExternalProgramAlignment, tr("External Alignment Program...") } };
--- a/pitch-track-align/pitch-track-align.sml Thu May 28 17:57:43 2020 +0100 +++ b/pitch-track-align/pitch-track-align.sml Fri May 29 17:39:48 2020 +0100 @@ -123,7 +123,7 @@ in rev (#1 acc) end - val _ = +(* val _ = app (fn (text, p) => TextIO.output (TextIO.stdErr, ("[" ^ text ^ "] -> " ^ Real.toString p ^ "\n"))) @@ -131,6 +131,18 @@ | (PITCH_UP d, p) => ("+", p) | (PITCH_DOWN d, p) => ("-", p)) (values, pitches)) + val _ = TextIO.output (TextIO.stdErr, "(end)\n"); + *) + val _ = + app (fn v => + TextIO.output (TextIO.stdErr, + (case v of + PITCH_NONE => "=0" + | PITCH_UP d => "+" ^ Real.toString d + | PITCH_DOWN d => "-" ^ Real.toString d) + ^ " ")) + values + val _ = TextIO.output (TextIO.stdErr, " (end)\n"); in (Vector.fromList times, Vector.fromList values, @@ -181,6 +193,11 @@ (* raw alignment returns the index into pitches2 for each element in pitches1 *) val raw = alignSeries values1 values2 + val _ = TextIO.output (TextIO.stdErr, "DTW output:\n") + val _ = Vector.app + (fn i => TextIO.output (TextIO.stdErr, Int.toString i ^ " ")) + raw + val _ = TextIO.output (TextIO.stdErr, "\n") val _ = TextIO.output (TextIO.stdErr, "Mean pitch difference: reference " ^ Real.toString (meanDiff pitches1 pitches2 raw)
--- a/repoint-lock.json Thu May 28 17:57:43 2020 +0100 +++ b/repoint-lock.json Fri May 29 17:39:48 2020 +0100 @@ -4,13 +4,13 @@ "pin": "0e32c328b02a" }, "svcore": { - "pin": "3072aa267248" + "pin": "14bf9bf5ac28" }, "svgui": { "pin": "bd1a7c84da8c" }, "svapp": { - "pin": "486add472c3f" + "pin": "1d6cca5a5621" }, "checker": { "pin": "e839338d3869"