Mercurial > hg > silvet
changeset 342:ad45b18427e0
Merge from branch livemode
author | Chris Cannam |
---|---|
date | Mon, 06 Jul 2015 09:15:21 +0100 |
parents | fa2ffbb786df (current diff) 705d807ca2ca (diff) |
children | 460cabb27bf7 |
files | |
diffstat | 55 files changed, 5026 insertions(+), 7796 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Apr 28 11:09:31 2015 +0100 +++ b/.hgsubstate Mon Jul 06 09:15:21 2015 +0100 @@ -1,3 +1,3 @@ 7a48704e9a0fac1486240f9f7b7e31436a588064 bqvec -4d109d855c671c514dbc4947b0dae7cada112d8c constant-q-cpp +56b5bb2893afc9748b1e1ce8b8b2c31b5863b728 constant-q-cpp d25a2e91e9d84aaff25e5d746398232d182d127d flattendynamics
--- a/Makefile.inc Tue Apr 28 11:09:31 2015 +0100 +++ b/Makefile.inc Mon Jul 06 09:15:21 2015 +0100 @@ -20,8 +20,8 @@ PLUGIN := silvet$(PLUGIN_EXT) -PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h $(SRC_DIR)/Instruments.h -PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/Instruments.cpp $(SRC_DIR)/libmain.cpp +PLUGIN_HEADERS := $(SRC_DIR)/Silvet.h $(SRC_DIR)/EM.h $(SRC_DIR)/Instruments.h $(SRC_DIR)/LiveInstruments.h +PLUGIN_SOURCES := $(SRC_DIR)/Silvet.cpp $(SRC_DIR)/EM.cpp $(SRC_DIR)/Instruments.cpp $(SRC_DIR)/LiveInstruments.cpp $(SRC_DIR)/libmain.cpp BQVEC_HEADERS := $(BQVEC_DIR)/Allocators.h $(BQVEC_DIR)/Restrict.h $(BQVEC_DIR)/VectorOps.h BQVEC_SOURCES := $(BQVEC_DIR)/src/Allocators.cpp @@ -58,7 +58,7 @@ # DO NOT DELETE src/Silvet.o: src/Silvet.h src/MedianFilter.h src/Instruments.h src/EM.h -src/Silvet.o: constant-q-cpp/src/dsp/Resampler.h +src/Silvet.o: constant-q-cpp/src/dsp/Resampler.h src/LiveInstruments.h src/EM.o: src/EM.h src/Instruments.h src/Instruments.o: src/Instruments.h data/include/templates.h src/Instruments.o: data/include/bassoon.h data/include/cello.h @@ -68,6 +68,16 @@ src/Instruments.o: data/include/violin.h data/include/viola.h src/Instruments.o: data/include/piano1.h data/include/piano2.h src/Instruments.o: data/include/piano3.h data/include/pianorwc.h +src/LiveInstruments.o: src/LiveInstruments.h src/Instruments.h +src/LiveInstruments.o: data/include/templates.h data/include/bassoon.h +src/LiveInstruments.o: data/include/cello.h data/include/clarinet.h +src/LiveInstruments.o: data/include/flute.h data/include/guitar.h +src/LiveInstruments.o: data/include/horn.h data/include/oboe.h +src/LiveInstruments.o: data/include/tenorsax.h data/include/violin.h +src/LiveInstruments.o: data/include/viola.h data/include/piano1.h +src/LiveInstruments.o: data/include/piano2.h data/include/piano3.h +src/LiveInstruments.o: data/include/pianorwc.h src/libmain.o: src/Silvet.h src/MedianFilter.h src/Instruments.h flattendynamics/flattendynamics-ladspa.o: flattendynamics/flattendynamics-ladspa.h src/Silvet.o: src/MedianFilter.h src/Instruments.h +src/LiveInstruments.o: src/Instruments.h
--- a/Makefile.linux Tue Apr 28 11:09:31 2015 +0100 +++ b/Makefile.linux Mon Jul 06 09:15:21 2015 +0100 @@ -6,7 +6,7 @@ CXXFLAGS := $(CFLAGS) -std=c++11 VAMPSDK_DIR := ../vamp-plugin-sdk -PLUGIN_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map +PLUGIN_LDFLAGS := -shared -Wl,-Bsymbolic -Wl,-z,defs -Wl,--version-script=vamp-plugin.map -lpthread PLUGIN_EXT := .so
--- a/data/include/templates.h Tue Apr 28 11:09:31 2015 +0100 +++ b/data/include/templates.h Mon Jul 06 09:15:21 2015 +0100 @@ -6,7 +6,7 @@ /* note: intended to parse as both C and C++ */ #define SILVET_TEMPLATE_COUNT 14 /* Number of instruments */ -#define SILVET_TEMPLATE_NOTE_COUNT 88 /* Number of notes per instrument */ +#define SILVET_TEMPLATE_NOTE_COUNT 88 /* Number of notes per instrument */ #define SILVET_TEMPLATE_HEIGHT 545 /* Frequency bins per template */ #define SILVET_TEMPLATE_MAX_SHIFT 2 /* Zeros at either end of template */ #define SILVET_TEMPLATE_SIZE 549 /* Height + 2 * max shift space */
--- a/silvet.n3 Tue Apr 28 11:09:31 2015 +0100 +++ b/silvet.n3 Mon Jul 06 09:15:21 2015 +0100 @@ -51,26 +51,30 @@ # cc:license <Place plugin license URI here and uncomment> ; vamp:identifier "silvet" ; vamp:vamp_API_version vamp:api_version_2 ; - owl:versionInfo "1" ; + owl:versionInfo "3" ; vamp:input_domain vamp:TimeDomain ; vamp:parameter plugbase:silvet_param_mode ; vamp:parameter plugbase:silvet_param_instrument ; vamp:parameter plugbase:silvet_param_finetune ; vamp:output plugbase:silvet_output_notes ; + vamp:output plugbase:silvet_output_onsets ; vamp:output plugbase:silvet_output_timefreq ; vamp:output plugbase:silvet_output_pitchactivation ; + vamp:output plugbase:silvet_output_chroma ; + vamp:output plugbase:silvet_output_templates ; . + plugbase:silvet_param_mode a vamp:QuantizedParameter ; vamp:identifier "mode" ; dc:title "Processing mode" ; dc:format "" ; vamp:min_value 0 ; - vamp:max_value 1 ; + vamp:max_value 2 ; vamp:unit "" ; vamp:quantize_step 1 ; vamp:default_value 1 ; - vamp:value_names ( "Draft (faster)" "Intensive (higher quality)"); + vamp:value_names ( "Draft (faster)" "Intensive (higher quality)" "Live (lower latency)"); . plugbase:silvet_param_instrument a vamp:QuantizedParameter ; vamp:identifier "instrument" ; @@ -97,21 +101,34 @@ plugbase:silvet_output_notes a vamp:SparseOutput ; vamp:identifier "notes" ; dc:title "Note transcription" ; - dc:description """Overall note transcription. Each note has time, duration, estimated pitch, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture.""" ; + dc:description """Overall note transcription. Each note has time, duration, estimated fundamental frequency, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture.""" ; vamp:fixed_bin_count "true" ; vamp:unit "Hz" ; vamp:bin_count 2 ; vamp:bin_names ( "Frequency" "Velocity"); vamp:sample_type vamp:VariableSampleRate ; + vamp:sample_rate 711 ; vamp:computes_event_type af:Note ; . +plugbase:silvet_output_onsets a vamp:SparseOutput ; + vamp:identifier "onsets" ; + dc:title "Note onsets" ; + dc:description """Note onsets, without durations. These can be calculated sooner than complete notes, because it isn't necessary to wait for a note to finish before returning its feature. Each event has time, estimated fundamental frequency in Hz, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture.""" ; + vamp:fixed_bin_count "true" ; + vamp:unit "Hz" ; + vamp:bin_count 2 ; + vamp:bin_names ( "Frequency" "Velocity"); + vamp:sample_type vamp:VariableSampleRate ; + vamp:sample_rate 711 ; + vamp:computes_event_type af:Onset ; + . plugbase:silvet_output_timefreq a vamp:DenseOutput ; vamp:identifier "timefreq" ; dc:title "Time-frequency distribution" ; - dc:description """Filtered constant-Q time-frequency distribution as used as input to the expectation-maximisation algorithm""" ; + dc:description """Filtered constant-Q time-frequency distribution as used as input to the expectation-maximisation algorithm.""" ; vamp:fixed_bin_count "true" ; + vamp:unit "" ; vamp:bin_count 545 ; - vamp:unit "" ; vamp:computes_signal_type af:Spectrogram ; . plugbase:silvet_output_pitchactivation a vamp:DenseOutput ; @@ -123,3 +140,20 @@ vamp:bin_count 88 ; vamp:computes_signal_type af:Spectrogram ; . +plugbase:silvet_output_chroma a vamp:DenseOutput ; + vamp:identifier "chroma" ; + dc:title "Pitch chroma distribution" ; + dc:description """Pitch chroma distribution formed by wrapping the un-thresholded pitch activation distribution into a single octave of semitone bins.""" ; + vamp:fixed_bin_count "true" ; + vamp:unit "" ; + vamp:bin_count 12 ; + vamp:computes_signal_type af:Chromagram ; + . +plugbase:silvet_output_templates a vamp:DenseOutput ; + vamp:identifier "templates" ; + dc:title "Templates" ; + dc:description """Constant-Q spectral templates for the selected instrument pack.""" ; + vamp:fixed_bin_count "true" ; + vamp:unit "" ; + vamp:bin_count 545 ; + .
--- a/src/EM.cpp Tue Apr 28 11:09:31 2015 +0100 +++ b/src/EM.cpp Mon Jul 06 09:15:21 2015 +0100 @@ -44,17 +44,13 @@ { m_pitches = allocate<float>(m_noteCount); m_updatePitches = allocate<float>(m_noteCount); - for (int n = 0; n < m_noteCount; ++n) { - m_pitches[n] = float(rand()) / RAND_MAX; - } + v_set(m_pitches, 1.f, m_noteCount); if (useShifts) { m_shifts = allocate_channels<float>(m_shiftCount, m_noteCount); m_updateShifts = allocate_channels<float>(m_shiftCount, m_noteCount); for (int f = 0; f < m_shiftCount; ++f) { - for (int n = 0; n < m_noteCount; ++n) { - m_shifts[f][n] = float(rand()) / RAND_MAX; - } + v_set(m_shifts[f], 1.f, m_noteCount); } } else { m_shifts = 0; @@ -65,7 +61,7 @@ m_updateSources = allocate_channels<float>(m_sourceCount, m_noteCount); for (int i = 0; i < m_sourceCount; ++i) { for (int n = 0; n < m_noteCount; ++n) { - m_sources[i][n] = (inRange(i, n) ? 1.0 : 0.0); + m_sources[i][n] = (inRange(i, n) ? 1.f : 0.f); } }
--- a/src/Instruments.cpp Tue Apr 28 11:09:31 2015 +0100 +++ b/src/Instruments.cpp Mon Jul 06 09:15:21 2015 +0100 @@ -19,16 +19,28 @@ #include <iostream> -const int InstrumentPack::templateNoteCount = SILVET_TEMPLATE_NOTE_COUNT; -const int InstrumentPack::templateHeight = SILVET_TEMPLATE_HEIGHT; -const int InstrumentPack::templateMaxShift = SILVET_TEMPLATE_MAX_SHIFT; -const int InstrumentPack::templateSize = SILVET_TEMPLATE_SIZE; - using std::string; using std::vector; using std::cerr; using std::endl; +InstrumentPack::InstrumentPack(int lowest, int highest, + std::string n, std::vector<Templates> tt) : + templateNoteCount(SILVET_TEMPLATE_NOTE_COUNT), + templateHeight(SILVET_TEMPLATE_HEIGHT), + templateMaxShift(SILVET_TEMPLATE_MAX_SHIFT), + templateSize(SILVET_TEMPLATE_SIZE), + lowestNote(lowest), + highestNote(highest), + maxPolyphony(5), + pitchSparsity(1.1), + sourceSparsity(1.2), + levelThreshold(5), + name(n), + templates(tt) +{ +} + const char *simpleInstruments[] = { // Each instrument has two consecutive slots, one for the pack // name and one for the template to look up @@ -134,7 +146,7 @@ "Piano", pianoTemplates); piano.maxPolyphony = 6; - piano.levelThreshold = 6; + piano.levelThreshold = 5; piano.pitchSparsity = 1.0; piano.sourceSparsity = 1.0; if (isOK(piano)) { @@ -188,8 +200,8 @@ silvet_templates_highest_note, // violin "String quartet", stringTemplates); - strings.maxPolyphony = 5; - strings.levelThreshold = 5; + strings.maxPolyphony = 6; + strings.levelThreshold = 3; if (isOK(strings)) { ii.push_back(strings); }
--- a/src/Instruments.h Tue Apr 28 11:09:31 2015 +0100 +++ b/src/Instruments.h Mon Jul 06 09:15:21 2015 +0100 @@ -32,10 +32,10 @@ class InstrumentPack { public: - static const int templateNoteCount; - static const int templateHeight; - static const int templateMaxShift; - static const int templateSize; + int templateNoteCount; + int templateHeight; + int templateMaxShift; + int templateSize; int lowestNote; int highestNote; @@ -60,15 +60,9 @@ private: InstrumentPack(int lowest, int highest, std::string n, - std::vector<Templates> tt) : - lowestNote(lowest), - highestNote(highest), - maxPolyphony(5), - pitchSparsity(1.1), - sourceSparsity(1.2), - levelThreshold(5), - name(n), - templates(tt) { } + std::vector<Templates> tt); + + friend class LiveAdapter; }; #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/LiveInstruments.cpp Mon Jul 06 09:15:21 2015 +0100 @@ -0,0 +1,110 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +/* + Silvet + + A Vamp plugin for note transcription. + Centre for Digital Music, Queen Mary University of London. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. See the file + COPYING included with this distribution for more information. +*/ + +#include "LiveInstruments.h" + +#include "data/include/templates.h" + +#include <iostream> + +using namespace std; + +InstrumentPack +LiveAdapter::adapt(const InstrumentPack &original) +{ + vector<InstrumentPack::Templates> templates; + +// cerr << "LiveAdapter: reduced template height is " << SILVET_TEMPLATE_HEIGHT/5 << endl; + + bool merge = false; + // The live template for piano has only one piano in it, so as + // to process faster. We make it by averaging the originals + if (original.name == "Piano") { + merge = true; + } + + InstrumentPack::Templates t; + bool first = true; + + for (const auto &origt: original.templates) { + + t.lowestNote = origt.lowestNote; + t.highestNote = origt.highestNote; + t.data.resize(origt.data.size()); + + for (int j = 0; j < int(origt.data.size()); ++j) { + + t.data[j].resize(SILVET_TEMPLATE_HEIGHT/5); + + for (int k = 0; k < SILVET_TEMPLATE_HEIGHT/5; ++k) { + + if (!merge || first) { + t.data[j][k] = 0.f; + } + + for (int m = 0; m < 5; ++m) { + t.data[j][k] += origt.data[j][k * 5 + m + 2]; + } + } + } + + if (!merge) { + templates.push_back(t); + t = InstrumentPack::Templates(); + } + + first = false; + } + + if (merge) { + templates.push_back(t); + } + + // re-normalise + for (auto &t: templates) { + for (auto &d: t.data) { + float sum = 0.f; + for (auto v: d) sum += v; + for (auto &v: d) v /= sum; + } + } + + InstrumentPack live(original.lowestNote, + original.highestNote, + original.name, + templates); + + live.templateHeight = SILVET_TEMPLATE_HEIGHT/5; + live.templateMaxShift = 0; + live.templateSize = live.templateHeight; + + live.maxPolyphony = original.maxPolyphony; + live.pitchSparsity = original.pitchSparsity; + live.sourceSparsity = original.sourceSparsity; + live.levelThreshold = original.levelThreshold / 15; + + return live; +} + +vector<InstrumentPack> +LiveAdapter::adaptAll(const vector<InstrumentPack> &v) +{ + vector<InstrumentPack> out; + for (int i = 0; i < (int)v.size(); ++i) { + InstrumentPack p(LiveAdapter::adapt(v[i])); + out.push_back(p); + } + return out; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/LiveInstruments.h Mon Jul 06 09:15:21 2015 +0100 @@ -0,0 +1,32 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +/* + Silvet + + A Vamp plugin for note transcription. + Centre for Digital Music, Queen Mary University of London. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. See the file + COPYING included with this distribution for more information. +*/ + +#ifndef SILVET_LIVE_INSTRUMENTS_H +#define SILVET_LIVE_INSTRUMENTS_H + +#include "Instruments.h" + +/** + * Adapt an instrument pack into a "live" version, with fewer bins per + * octave and so lower CQ latency. + */ +class LiveAdapter +{ +public: + static InstrumentPack adapt(const InstrumentPack &original); + static std::vector<InstrumentPack> adaptAll(const std::vector<InstrumentPack> &); +}; + +#endif
--- a/src/Silvet.cpp Tue Apr 28 11:09:31 2015 +0100 +++ b/src/Silvet.cpp Mon Jul 06 09:15:21 2015 +0100 @@ -21,6 +21,7 @@ #include "MedianFilter.h" #include "constant-q-cpp/src/dsp/Resampler.h" #include "flattendynamics-ladspa.h" +#include "LiveInstruments.h" #include <vector> #include <future> @@ -37,18 +38,23 @@ using Vamp::RealTime; static int processingSampleRate = 44100; -static int processingBPO = 60; + +static int binsPerSemitoneLive = 1; +static int binsPerSemitoneNormal = 5; static int minInputSampleRate = 100; static int maxInputSampleRate = 192000; +static const Silvet::ProcessingMode defaultMode = Silvet::HighQualityMode; + Silvet::Silvet(float inputSampleRate) : Plugin(inputSampleRate), m_instruments(InstrumentPack::listInstrumentPacks()), + m_liveInstruments(LiveAdapter::adaptAll(m_instruments)), m_resampler(0), m_flattener(0), m_cq(0), - m_hqMode(true), + m_mode(defaultMode), m_fineTuning(false), m_instrument(0), m_colsPerSec(50), @@ -141,13 +147,13 @@ desc.identifier = "mode"; desc.name = "Processing mode"; desc.unit = ""; - desc.description = "Sets the tradeoff of processing speed against transcription quality. Draft mode modifies a number of internal parameters in favour of speed. Intensive mode (the default) will almost always produce better results."; + desc.description = "Sets the tradeoff of processing speed against transcription quality. Live mode is much faster and detects notes with relatively low latency; Intensive mode (the default) is slower but will almost always produce better results."; desc.minValue = 0; - desc.maxValue = 1; - desc.defaultValue = 1; + desc.maxValue = 2; + desc.defaultValue = int(defaultMode); desc.isQuantized = true; desc.quantizeStep = 1; - desc.valueNames.push_back("Draft (faster)"); + desc.valueNames.push_back("Live (faster and lower latency)"); desc.valueNames.push_back("Intensive (higher quality)"); list.push_back(desc); @@ -185,7 +191,7 @@ Silvet::getParameter(string identifier) const { if (identifier == "mode") { - return m_hqMode ? 1.f : 0.f; + return (float)(int)m_mode; } else if (identifier == "finetune") { return m_fineTuning ? 1.f : 0.f; } else if (identifier == "instrument") { @@ -198,7 +204,7 @@ Silvet::setParameter(string identifier, float value) { if (identifier == "mode") { - m_hqMode = (value > 0.5); + m_mode = (ProcessingMode)(int)(value + 0.5); } else if (identifier == "finetune") { m_fineTuning = (value > 0.5); } else if (identifier == "instrument") { @@ -232,7 +238,7 @@ OutputDescriptor d; d.identifier = "notes"; d.name = "Note transcription"; - d.description = "Overall note transcription. Each note has time, duration, estimated pitch, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture."; + d.description = "Overall note transcription. Each note has time, duration, estimated fundamental frequency, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture."; d.unit = "Hz"; d.hasFixedBinCount = true; d.binCount = 2; @@ -246,23 +252,55 @@ m_notesOutputNo = list.size(); list.push_back(d); + d.identifier = "onsets"; + d.name = "Note onsets"; + d.description = "Note onsets, without durations. These can be calculated sooner than complete notes, because it isn't necessary to wait for a note to finish before returning its feature. Each event has time, estimated fundamental frequency in Hz, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture."; + d.unit = "Hz"; + d.hasFixedBinCount = true; + d.binCount = 2; + d.binNames.push_back("Frequency"); + d.binNames.push_back("Velocity"); + d.hasKnownExtents = false; + d.isQuantized = false; + d.sampleType = OutputDescriptor::VariableSampleRate; + d.sampleRate = processingSampleRate / (m_cq ? m_cq->getColumnHop() : 62); + d.hasDuration = false; + m_onsetsOutputNo = list.size(); + list.push_back(d); + + d.identifier = "onoffsets"; + d.name = "Note onsets and offsets"; + d.description = "Note onsets and offsets as separate events. Each onset event has time, estimated fundamental frequency in Hz, and a synthetic MIDI velocity (1-127) estimated from the strength of the pitch in the mixture. Offsets are represented in the same way but with a velocity of 0."; + d.unit = "Hz"; + d.hasFixedBinCount = true; + d.binCount = 2; + d.binNames.push_back("Frequency"); + d.binNames.push_back("Velocity"); + d.hasKnownExtents = false; + d.isQuantized = false; + d.sampleType = OutputDescriptor::VariableSampleRate; + d.sampleRate = processingSampleRate / (m_cq ? m_cq->getColumnHop() : 62); + d.hasDuration = false; + m_onOffsetsOutputNo = list.size(); + list.push_back(d); + d.identifier = "timefreq"; d.name = "Time-frequency distribution"; d.description = "Filtered constant-Q time-frequency distribution as used as input to the expectation-maximisation algorithm."; d.unit = ""; d.hasFixedBinCount = true; - d.binCount = m_instruments[0].templateHeight; + d.binCount = getPack(0).templateHeight; d.binNames.clear(); if (m_cq) { char name[50]; - for (int i = 0; i < m_instruments[0].templateHeight; ++i) { + for (int i = 0; i < getPack(0).templateHeight; ++i) { // We have a 600-bin (10 oct 60-bin CQ) of which the // lowest-frequency 55 bins have been dropped, for a // 545-bin template. The native CQ bins go high->low // frequency though, so these are still the first 545 bins // as reported by getBinFrequency, though in reverse order float freq = m_cq->getBinFrequency - (m_instruments[0].templateHeight - i - 1); + (getPack(0).templateHeight - i - 1); sprintf(name, "%.1f Hz", freq); d.binNames.push_back(name); } @@ -280,11 +318,11 @@ d.description = "Pitch activation distribution resulting from expectation-maximisation algorithm, prior to note extraction."; d.unit = ""; d.hasFixedBinCount = true; - d.binCount = m_instruments[0].templateNoteCount; + d.binCount = getPack(0).templateNoteCount; d.binNames.clear(); if (m_cq) { - for (int i = 0; i < m_instruments[0].templateNoteCount; ++i) { - d.binNames.push_back(noteName(i, 0, 1)); + for (int i = 0; i < getPack(0).templateNoteCount; ++i) { + d.binNames.push_back(getNoteName(i, 0)); } } d.hasKnownExtents = false; @@ -304,7 +342,7 @@ d.binNames.clear(); if (m_cq) { for (int i = 0; i < 12; ++i) { - d.binNames.push_back(chromaName(i)); + d.binNames.push_back(getChromaName(i)); } } d.hasKnownExtents = false; @@ -315,11 +353,40 @@ m_chromaOutputNo = list.size(); list.push_back(d); + d.identifier = "templates"; + d.name = "Templates"; + d.description = "Constant-Q spectral templates for the selected instrument pack."; + d.unit = ""; + d.hasFixedBinCount = true; + d.binCount = getPack(0).templateHeight; + d.binNames.clear(); + if (m_cq) { + char name[50]; + for (int i = 0; i < getPack(0).templateHeight; ++i) { + // We have a 600-bin (10 oct 60-bin CQ) of which the + // lowest-frequency 55 bins have been dropped, for a + // 545-bin template. The native CQ bins go high->low + // frequency though, so these are still the first 545 bins + // as reported by getBinFrequency, though in reverse order + float freq = m_cq->getBinFrequency + (getPack(0).templateHeight - i - 1); + sprintf(name, "%.1f Hz", freq); + d.binNames.push_back(name); + } + } + d.hasKnownExtents = false; + d.isQuantized = false; + d.sampleType = OutputDescriptor::FixedSampleRate; + d.sampleRate = m_colsPerSec; + d.hasDuration = false; + m_templateOutputNo = list.size(); + list.push_back(d); + return list; } std::string -Silvet::chromaName(int pitch) const +Silvet::getChromaName(int pitch) const { static const char *names[] = { "A", "A#", "B", "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#" @@ -329,17 +396,18 @@ } std::string -Silvet::noteName(int note, int shift, int shiftCount) const +Silvet::getNoteName(int note, int shift) const { - string n = chromaName(note % 12); + string n = getChromaName(note % 12); int oct = (note + 9) / 12; char buf[30]; float pshift = 0.f; + int shiftCount = getShiftCount(); if (shiftCount > 1) { - // see noteFrequency below + // see getNoteFrequency below pshift = float((shiftCount - shift) - int(shiftCount / 2) - 1) / shiftCount; } @@ -356,7 +424,7 @@ } float -Silvet::noteFrequency(int note, int shift, int shiftCount) const +Silvet::getNoteFrequency(int note, int shift) const { // Convert shift number to a pitch shift. The given shift number // is an offset into the template array, which starts with some @@ -372,12 +440,18 @@ // down in pitch, for a negative pitch shift. float pshift = 0.f; + int shiftCount = getShiftCount(); if (shiftCount > 1) { pshift = float((shiftCount - shift) - int(shiftCount / 2) - 1) / shiftCount; } - return float(27.5 * pow(2.0, (note + pshift) / 12.0)); + float freq = float(27.5 * pow(2.0, (note + pshift) / 12.0)); + +// cerr << "note = " << note << ", shift = " << shift << ", shiftCount = " +// << shiftCount << ", obtained freq = " << freq << endl; + + return freq; } bool @@ -428,38 +502,55 @@ m_flattener = new FlattenDynamics(m_inputSampleRate); // before resampling m_flattener->reset(); + // this happens to be processingSampleRate / 3, and is the top + // freq used for the EM templates: + double maxFreq = 14700; + + if (m_mode == LiveMode) { + // We only have 12 bpo rather than 60, so we need the top bin + // to be the middle one of the top 5, i.e. 2/5 of a semitone + // lower than 14700 + maxFreq *= powf(2.0, -1.0 / 30.0); + } + double minFreq = 27.5; - if (!m_hqMode) { + if (m_mode == LiveMode) { // We don't actually return any notes from the bottom octave, // so we can just pad with zeros minFreq *= 2; } + int bpo = 12 * + (m_mode == LiveMode ? binsPerSemitoneLive : binsPerSemitoneNormal); + CQParameters params(processingSampleRate, minFreq, - processingSampleRate / 3, - processingBPO); + maxFreq, + bpo); - params.q = 0.95; // MIREX code uses 0.8, but it seems 0.9 or lower - // drops the FFT size to 512 from 1024 and alters - // some other processing parameters, making - // everything much, much slower. Could be a flaw - // in the CQ parameter calculations, must check - params.atomHopFactor = 0.3; + params.q = 0.8; + params.atomHopFactor = (m_mode == LiveMode ? 1.0 : 0.3); params.threshold = 0.0005; + params.decimator = + (m_mode == LiveMode ? + CQParameters::FasterDecimator : CQParameters::BetterDecimator); params.window = CQParameters::Hann; m_cq = new CQSpectrogram(params, CQSpectrogram::InterpolateLinear); - m_colsPerSec = m_hqMode ? 50 : 25; +// cerr << "CQ bins = " << m_cq->getTotalBins() << endl; +// cerr << "CQ min freq = " << m_cq->getMinFrequency() << " (and for confirmation, freq of bin 0 = " << m_cq->getBinFrequency(0) << ")" << endl; + + m_colsPerSec = 50; for (int i = 0; i < (int)m_postFilter.size(); ++i) { delete m_postFilter[i]; } m_postFilter.clear(); - for (int i = 0; i < m_instruments[0].templateNoteCount; ++i) { - m_postFilter.push_back(new MedianFilter<double>(3)); + int postFilterLength = 3; + for (int i = 0; i < getPack(0).templateNoteCount; ++i) { + m_postFilter.push_back(new MedianFilter<double>(postFilterLength)); } m_pianoRoll.clear(); m_inputGains.clear(); @@ -472,9 +563,14 @@ Silvet::FeatureSet Silvet::process(const float *const *inputBuffers, Vamp::RealTime timestamp) { + FeatureSet fs; + if (!m_haveStartTime) { + m_startTime = timestamp; m_haveStartTime = true; + + insertTemplateFeatures(fs); } vector<float> flattened(m_blockSize); @@ -507,7 +603,7 @@ if (hadCount < resamplerLatency) { int stillToDrop = resamplerLatency - hadCount; if (stillToDrop >= int(data.size())) { - return FeatureSet(); + return fs; } else { data = vector<double>(data.begin() + stillToDrop, data.end()); } @@ -515,7 +611,7 @@ } Grid cqout = m_cq->process(data); - FeatureSet fs = transcribe(cqout); + transcribe(cqout, fs); return fs; } @@ -523,38 +619,108 @@ Silvet::getRemainingFeatures() { Grid cqout = m_cq->getRemainingOutput(); - FeatureSet fs = transcribe(cqout); + FeatureSet fs; + + if (m_columnCount == 0) { + // process() was never called, but we still want these + insertTemplateFeatures(fs); + } else { + + // Complete the transcription + + transcribe(cqout, fs); + + // And make sure any extant playing notes are finished and returned + + m_pianoRoll.push_back({}); + + auto events = noteTrack(); + + for (const auto &f : events.notes) { + fs[m_notesOutputNo].push_back(f); + } + + for (const auto &f : events.onsets) { + fs[m_onsetsOutputNo].push_back(f); + } + + for (const auto &f : events.onOffsets) { + fs[m_onOffsetsOutputNo].push_back(f); + } + } + return fs; } -Silvet::FeatureSet -Silvet::transcribe(const Grid &cqout) +void +Silvet::insertTemplateFeatures(FeatureSet &fs) +{ + const InstrumentPack &pack = getPack(m_instrument); + for (int i = 0; i < int(pack.templates.size()) * pack.templateNoteCount; ++i) { + RealTime timestamp = RealTime::fromSeconds(double(i) / m_colsPerSec); + Feature f; + char buffer[50]; + sprintf(buffer, "Note %d", i + 1); + f.label = buffer; + f.hasTimestamp = true; + f.timestamp = timestamp; + f.values = pack.templates[i / pack.templateNoteCount] + .data[i % pack.templateNoteCount]; + fs[m_templateOutputNo].push_back(f); + } +} + +int +Silvet::getShiftCount() const +{ + bool wantShifts = (m_mode == HighQualityMode) && m_fineTuning; + int shiftCount = 1; + if (wantShifts) { + const InstrumentPack &pack(getPack(m_instrument)); + shiftCount = pack.templateMaxShift * 2 + 1; + } + return shiftCount; +} + +void +Silvet::transcribe(const Grid &cqout, Silvet::FeatureSet &fs) { Grid filtered = preProcess(cqout); - FeatureSet fs; - - if (filtered.empty()) return fs; + if (filtered.empty()) return; - const InstrumentPack &pack = m_instruments[m_instrument]; - - for (int i = 0; i < (int)filtered.size(); ++i) { - Feature f; - for (int j = 0; j < pack.templateHeight; ++j) { - f.values.push_back(float(filtered[i][j])); - } - fs[m_fcqOutputNo].push_back(f); - } + const InstrumentPack &pack(getPack(m_instrument)); int width = filtered.size(); + double silenceThreshold = 0.01; + + for (int i = 0; i < width; ++i) { + + RealTime timestamp = getColumnTimestamp(m_pianoRoll.size() - 1 + i); + float inputGain = getInputGainAt(timestamp); + + Feature f; + double rms = 0.0; + + for (int j = 0; j < pack.templateHeight; ++j) { + double v = filtered[i][j]; + rms += v * v; + f.values.push_back(float(v)); + } + + rms = sqrt(rms / pack.templateHeight); + if (rms / inputGain < silenceThreshold) { + filtered[i].clear(); + } + + fs[m_fcqOutputNo].push_back(f); + } + Grid localPitches(width); - bool wantShifts = m_hqMode && m_fineTuning; - int shiftCount = 1; - if (wantShifts) { - shiftCount = pack.templateMaxShift * 2 + 1; - } + int shiftCount = getShiftCount(); + bool wantShifts = (shiftCount > 1); vector<vector<int> > localBestShifts; if (wantShifts) { @@ -565,38 +731,50 @@ #define MAX_EM_THREADS 8 #endif + int emThreadCount = MAX_EM_THREADS; + if (m_mode == LiveMode && pack.templates.size() == 1) { + // The EM step is probably not slow enough to merit it + emThreadCount = 1; + } + #if (defined(MAX_EM_THREADS) && (MAX_EM_THREADS > 1)) - for (int i = 0; i < width; ) { - typedef future<pair<vector<double>, vector<int>>> EMFuture; - vector<EMFuture> results; - for (int j = 0; j < MAX_EM_THREADS && i + j < width; ++j) { - results.push_back - (async(std::launch::async, - [&](int index) { - return applyEM(pack, filtered.at(index), wantShifts); - }, i + j)); + if (emThreadCount > 1) { + for (int i = 0; i < width; ) { + typedef future<pair<vector<double>, vector<int>>> EMFuture; + vector<EMFuture> results; + for (int j = 0; j < emThreadCount && i + j < width; ++j) { + results.push_back + (async(std::launch::async, + [&](int index) { + return applyEM(pack, filtered.at(index)); + }, i + j)); + } + for (int j = 0; j < emThreadCount && i + j < width; ++j) { + auto out = results[j].get(); + localPitches[i+j] = out.first; + if (wantShifts) localBestShifts[i+j] = out.second; + } + i += emThreadCount; } - for (int j = 0; j < MAX_EM_THREADS && i + j < width; ++j) { - auto out = results[j].get(); - localPitches[i+j] = out.first; - if (wantShifts) localBestShifts[i+j] = out.second; - } - i += MAX_EM_THREADS; - } -#else - for (int i = 0; i < width; ++i) { - auto out = applyEM(pack, filtered.at(i), wantShifts); - localPitches[i] = out.first; - if (wantShifts) localBestShifts[i] = out.second; } #endif - + + if (emThreadCount == 1) { + for (int i = 0; i < width; ++i) { + auto out = applyEM(pack, filtered.at(i)); + localPitches[i] = out.first; + if (wantShifts) localBestShifts[i] = out.second; + } + } + for (int i = 0; i < width; ++i) { - // This returns a filtered column, and pushes the - // up-to-max-polyphony activation column to m_pianoRoll - vector<double> filtered = postProcess - (localPitches[i], localBestShifts[i], wantShifts); + vector<double> filtered; + + for (int j = 0; j < pack.templateNoteCount; ++j) { + m_postFilter[j]->push(localPitches[i][j]); + filtered.push_back(m_postFilter[j]->get()); + } RealTime timestamp = getColumnTimestamp(m_pianoRoll.size() - 1); float inputGain = getInputGainAt(timestamp); @@ -615,27 +793,41 @@ f.values[j % 12] += filtered[j] / inputGain; } fs[m_chromaOutputNo].push_back(f); - - FeatureList noteFeatures = noteTrack(shiftCount); - for (FeatureList::const_iterator fi = noteFeatures.begin(); - fi != noteFeatures.end(); ++fi) { - fs[m_notesOutputNo].push_back(*fi); + // This pushes the up-to-max-polyphony activation column to + // m_pianoRoll + postProcess(filtered, localBestShifts[i]); + + auto events = noteTrack(); + + for (const auto &f : events.notes) { + fs[m_notesOutputNo].push_back(f); + } + + for (const auto &f : events.onsets) { + fs[m_onsetsOutputNo].push_back(f); + } + + for (const auto &f : events.onOffsets) { + fs[m_onOffsetsOutputNo].push_back(f); } } - - return fs; } pair<vector<double>, vector<int> > Silvet::applyEM(const InstrumentPack &pack, - const vector<double> &column, - bool wantShifts) + const vector<double> &column) { double columnThreshold = 1e-5; + if (m_mode == LiveMode) { + columnThreshold /= 15; + } + vector<double> pitches(pack.templateNoteCount, 0.0); vector<int> bestShifts; + + if (column.empty()) return { pitches, bestShifts }; double sum = 0.0; for (int j = 0; j < pack.templateHeight; ++j) { @@ -643,12 +835,12 @@ } if (sum < columnThreshold) return { pitches, bestShifts }; - EM em(&pack, m_hqMode); + EM em(&pack, m_mode == HighQualityMode); em.setPitchSparsity(pack.pitchSparsity); em.setSourceSparsity(pack.sourceSparsity); - int iterations = m_hqMode ? 20 : 10; + int iterations = (m_mode == HighQualityMode ? 20 : 10); for (int j = 0; j < iterations; ++j) { em.iterate(column.data()); @@ -657,10 +849,7 @@ const float *pitchDist = em.getPitchDistribution(); const float *const *shiftDist = em.getShifts(); - int shiftCount = 1; - if (wantShifts) { - shiftCount = pack.templateMaxShift * 2 + 1; - } + int shiftCount = getShiftCount(); for (int j = 0; j < pack.templateNoteCount; ++j) { @@ -668,7 +857,7 @@ int bestShift = 0; float bestShiftValue = 0.0; - if (wantShifts) { + if (shiftCount > 1) { for (int k = 0; k < shiftCount; ++k) { float value = shiftDist[k][j]; if (k == 0 || value > bestShiftValue) { @@ -702,7 +891,7 @@ // size we reduce to in a moment int latentColumns = m_cq->getLatency() / m_cq->getColumnHop(); - const InstrumentPack &pack = m_instruments[m_instrument]; + const InstrumentPack &pack(getPack(m_instrument)); for (int i = 0; i < width; ++i) { @@ -721,39 +910,42 @@ vector<double> outCol(pack.templateHeight); // In HQ mode, the CQ returns 600 bins and we ignore the - // lowest 55 of them. + // lowest 55 of them (assuming binsPerSemitone == 5). // - // In draft mode the CQ is an octave shorter, returning - // 540 bins, so we instead pad them with an additional 5 - // zeros. + // In live mode the CQ is an octave shorter, returning 540 + // bins or equivalent, so we instead pad them with an + // additional 5 or equivalent zeros. // // We also need to reverse the column as we go, since the // raw CQ has the high frequencies first and we need it // the other way around. - if (m_hqMode) { + int bps = (m_mode == LiveMode ? + binsPerSemitoneLive : binsPerSemitoneNormal); + + if (m_mode == HighQualityMode) { for (int j = 0; j < pack.templateHeight; ++j) { - int ix = inCol.size() - j - 55; + int ix = inCol.size() - j - (11 * bps); outCol[j] = inCol[ix]; } } else { - for (int j = 0; j < 5; ++j) { + for (int j = 0; j < bps; ++j) { outCol[j] = 0.0; } - for (int j = 5; j < pack.templateHeight; ++j) { - int ix = inCol.size() - j + 4; + for (int j = bps; j < pack.templateHeight; ++j) { + int ix = inCol.size() - j + (bps-1); outCol[j] = inCol[ix]; } } vector<double> noiseLevel1 = - MedianFilter<double>::filter(40, outCol); + MedianFilter<double>::filter(8 * bps, outCol); for (int j = 0; j < pack.templateHeight; ++j) { noiseLevel1[j] = std::min(outCol[j], noiseLevel1[j]); } vector<double> noiseLevel2 = - MedianFilter<double>::filter(40, noiseLevel1); + MedianFilter<double>::filter(8 * bps, noiseLevel1); for (int j = 0; j < pack.templateHeight; ++j) { outCol[j] = std::max(outCol[j] - noiseLevel2[j], 0.0); } @@ -767,19 +959,11 @@ return out; } -vector<double> +void Silvet::postProcess(const vector<double> &pitches, - const vector<int> &bestShifts, - bool wantShifts) + const vector<int> &bestShifts) { - const InstrumentPack &pack = m_instruments[m_instrument]; - - vector<double> filtered; - - for (int j = 0; j < pack.templateNoteCount; ++j) { - m_postFilter[j]->push(pitches[j]); - filtered.push_back(m_postFilter[j]->get()); - } + const InstrumentPack &pack(getPack(m_instrument)); // Threshold for level and reduce number of candidate pitches @@ -788,8 +972,29 @@ ValueIndexMap strengths; for (int j = 0; j < pack.templateNoteCount; ++j) { - double strength = filtered[j]; + + double strength = pitches[j]; if (strength < pack.levelThreshold) continue; + + // In live mode with only a 12-bpo CQ, we are very likely to + // get clusters of two or three high scores at a time for + // neighbouring semitones. Eliminate these by picking only the + // peaks (except that we never eliminate a note that has + // already been established as currently playing). This means + // we can't recognise actual semitone chords if they ever + // appear, but it's not as if live mode is good enough for + // that to be a big deal anyway. + if (m_mode == LiveMode) { + if (m_current.find(j) == m_current.end() && + (j == 0 || + j + 1 == pack.templateNoteCount || + pitches[j] < pitches[j-1] || + pitches[j] < pitches[j+1])) { + // not a peak or a currently-playing note: skip it + continue; + } + } + strengths.insert(ValueIndexMap::value_type(strength, j)); } @@ -798,6 +1003,8 @@ map<int, double> active; map<int, int> activeShifts; + int shiftCount = getShiftCount(); + while (int(active.size()) < pack.maxPolyphony && si != strengths.begin()) { --si; @@ -807,22 +1014,22 @@ active[j] = strength; - if (wantShifts) { + if (shiftCount > 1) { activeShifts[j] = bestShifts[j]; } } m_pianoRoll.push_back(active); - if (wantShifts) { + if (shiftCount > 1) { m_pianoRollShifts.push_back(activeShifts); } - return filtered; + return; } -Vamp::Plugin::FeatureList -Silvet::noteTrack(int shiftCount) +Silvet::FeatureChunk +Silvet::noteTrack() { // Minimum duration pruning, and conversion to notes. We can only // report notes that have just ended (i.e. that are absent in the @@ -838,28 +1045,21 @@ double columnDuration = 1.0 / m_colsPerSec; // only keep notes >= 100ms or thereabouts - int durationThreshold = floor(0.1 / columnDuration); // columns + double durationThrSec = 0.1; + int durationThreshold = floor(durationThrSec / columnDuration); // in cols if (durationThreshold < 1) durationThreshold = 1; - FeatureList noteFeatures; + FeatureList noteFeatures, onsetFeatures, onOffsetFeatures; if (width < durationThreshold + 1) { - return noteFeatures; + return { noteFeatures, onsetFeatures, onOffsetFeatures }; } - //!!! try: repeated note detection? (look for change in first derivative of the pitch matrix) - for (map<int, double>::const_iterator ni = m_pianoRoll[width-1].begin(); ni != m_pianoRoll[width-1].end(); ++ni) { int note = ni->first; - - if (active.find(note) != active.end()) { - // the note is still playing - continue; - } - // the note was playing but just ended int end = width; int start = end-1; @@ -868,25 +1068,52 @@ } ++start; - if ((end - start) < durationThreshold) { + int duration = end - start; + + if (duration < durationThreshold) { continue; } - emitNote(start, end, note, shiftCount, noteFeatures); + if (duration == durationThreshold) { + m_current.insert(note); + emitOnset(start, note, onsetFeatures); + emitOnset(start, note, onOffsetFeatures); + } + + if (active.find(note) == active.end()) { + // the note was playing but just ended + m_current.erase(note); + emitNote(start, end, note, noteFeatures); + emitOffset(start, end, note, onOffsetFeatures); + } else { // still playing + // repeated note detection: if level is greater than this + // multiple of its previous value, then we end the note and + // restart it with the same pitch + double restartFactor = 1.5; + if (duration >= durationThreshold * 2 && + (active.find(note)->second > + restartFactor * m_pianoRoll[width-1][note])) { + m_current.erase(note); + emitNote(start, end-1, note, noteFeatures); + emitOffset(start, end-1, note, onOffsetFeatures); + // and remove this so that we start counting the new + // note's duration from the current position + m_pianoRoll[width-1].erase(note); + } + } } // cerr << "returning " << noteFeatures.size() << " complete note(s) " << endl; - return noteFeatures; + return { noteFeatures, onsetFeatures, onOffsetFeatures }; } void -Silvet::emitNote(int start, int end, int note, int shiftCount, - FeatureList ¬eFeatures) +Silvet::emitNote(int start, int end, int note, FeatureList ¬eFeatures) { int partStart = start; int partShift = 0; - int partVelocity = 0; + double partStrength = 0; int partThreshold = floor(0.05 * m_colsPerSec); @@ -896,7 +1123,7 @@ int shift = 0; - if (shiftCount > 1) { + if (getShiftCount() > 1) { shift = m_pianoRollShifts[i][note]; @@ -913,17 +1140,15 @@ i, note, partShift, - shiftCount, - partVelocity)); + partStrength)); partStart = i; partShift = shift; - partVelocity = 0; + partStrength = 0; } } - int v = round(strength * 2); - if (v > partVelocity) { - partVelocity = v; + if (strength > partStrength) { + partStrength = strength; } } @@ -932,11 +1157,50 @@ end, note, partShift, - shiftCount, - partVelocity)); + partStrength)); } } +void +Silvet::emitOnset(int start, int note, FeatureList &onOffsetFeatures) +{ + int len = int(m_pianoRoll.size()); + + double onsetStrength = 0; + + int shift = 0; + if (getShiftCount() > 1) { + shift = m_pianoRollShifts[start][note]; + } + + for (int i = start; i < len; ++i) { + double strength = m_pianoRoll[i][note]; + if (strength > onsetStrength) { + onsetStrength = strength; + } + } + + if (onsetStrength == 0) return; + + onOffsetFeatures.push_back(makeOnsetFeature(start, + note, + shift, + onsetStrength)); +} + +void +Silvet::emitOffset(int start, int end, int note, FeatureList &onOffsetFeatures) +{ + int shift = 0; + if (getShiftCount() > 1) { + shift = m_pianoRollShifts[start][note]; + } + + onOffsetFeatures.push_back(makeOffsetFeature(end, + note, + shift)); +} + RealTime Silvet::getColumnTimestamp(int column) { @@ -952,8 +1216,7 @@ int end, int note, int shift, - int shiftCount, - int velocity) + double strength) { Feature f; @@ -964,22 +1227,75 @@ f.duration = getColumnTimestamp(end) - f.timestamp; f.values.clear(); + f.values.push_back(getNoteFrequency(note, shift)); + f.values.push_back(getVelocityFor(strength, start)); - f.values.push_back - (noteFrequency(note, shift, shiftCount)); - - float inputGain = getInputGainAt(f.timestamp); -// cerr << "adjusting velocity from " << velocity << " to " << round(velocity/inputGain) << endl; - velocity = round(velocity / inputGain); - if (velocity > 127) velocity = 127; - if (velocity < 1) velocity = 1; - f.values.push_back(velocity); - - f.label = noteName(note, shift, shiftCount); + f.label = getNoteName(note, shift); return f; } +Silvet::Feature +Silvet::makeOnsetFeature(int start, + int note, + int shift, + double strength) +{ + Feature f; + + f.hasTimestamp = true; + f.timestamp = getColumnTimestamp(start); + + f.hasDuration = false; + + f.values.clear(); + f.values.push_back(getNoteFrequency(note, shift)); + f.values.push_back(getVelocityFor(strength, start)); + + f.label = getNoteName(note, shift); + + return f; +} + +Silvet::Feature +Silvet::makeOffsetFeature(int col, + int note, + int shift) +{ + Feature f; + + f.hasTimestamp = true; + f.timestamp = getColumnTimestamp(col); + + f.hasDuration = false; + + f.values.clear(); + f.values.push_back(getNoteFrequency(note, shift)); + f.values.push_back(0); // velocity 0 for offset + + f.label = getNoteName(note, shift) + " off"; + + return f; +} + +int +Silvet::getVelocityFor(double strength, int column) +{ + RealTime rt = getColumnTimestamp(column + 1); + + float inputGain = getInputGainAt(rt); + + double scale = 2.0; + if (m_mode == LiveMode) scale = 20.0; + + double velocity = round((strength * scale) / inputGain); + + if (velocity > 127.0) velocity = 127.0; + if (velocity < 1.0) velocity = 1.0; // assume surpassed 0 threshold already + + return int(velocity); +} + float Silvet::getInputGainAt(RealTime t) {
--- a/src/Silvet.h Tue Apr 28 11:09:31 2015 +0100 +++ b/src/Silvet.h Mon Jul 06 09:15:21 2015 +0100 @@ -71,14 +71,29 @@ FeatureSet getRemainingFeatures(); + enum ProcessingMode { + LiveMode = 0, + HighQualityMode = 1, + }; + protected: const std::vector<InstrumentPack> m_instruments; + const std::vector<InstrumentPack> m_liveInstruments; + const InstrumentPack &getPack(int instrument) const { + if (m_mode == LiveMode) { + return m_liveInstruments[instrument]; + } else { + return m_instruments[instrument]; + } + } + Resampler *m_resampler; FlattenDynamics *m_flattener; CQSpectrogram *m_cq; - bool m_hqMode; + ProcessingMode m_mode; + bool m_fineTuning; int m_instrument; int m_colsPerSec; @@ -89,34 +104,52 @@ vector<map<int, double> > m_pianoRoll; vector<map<int, int> > m_pianoRollShifts; map<Vamp::RealTime, float> m_inputGains; + set<int> m_current; Grid preProcess(const Grid &); std::pair<vector<double>, vector<int> > applyEM(const InstrumentPack &pack, - const vector<double> &column, - bool wantShifts); + const vector<double> &column); - vector<double> postProcess(const vector<double> &pitches, - const vector<int> &bestShifts, - bool wantShifts); // -> piano roll column + void postProcess(const vector<double> &pitches, + const vector<int> &bestShifts); // -> piano roll column - FeatureList noteTrack(int shiftCount); + struct FeatureChunk { + FeatureList notes; + FeatureList onsets; + FeatureList onOffsets; + }; - void emitNote(int start, int end, int note, int shiftCount, + int getShiftCount() const; + + FeatureChunk noteTrack(); // notes, on/offsets + + void emitNote(int start, int end, int note, FeatureList ¬eFeatures); + + void emitOnset(int start, int note, + FeatureList &onOffsetFeatures); + + void emitOffset(int start, int end, int note, + FeatureList &onOffsetFeatures); Vamp::RealTime getColumnTimestamp(int column); - Feature makeNoteFeature(int start, int end, int note, int shift, - int shiftCount, int velocity); + Feature makeNoteFeature(int start, int end, int note, int shift, double strength); + Feature makeOnsetFeature(int start, int note, int shift, double strength); + Feature makeOffsetFeature(int col, int note, int shift); + int getVelocityFor(double strength, int column); + float getInputGainAt(Vamp::RealTime t); - FeatureSet transcribe(const Grid &); + void insertTemplateFeatures(FeatureSet &); + + void transcribe(const Grid &, FeatureSet &); - string chromaName(int n) const; - string noteName(int n, int shift, int shiftCount) const; - float noteFrequency(int n, int shift, int shiftCount) const; + string getChromaName(int n) const; + string getNoteName(int n, int shift) const; + float getNoteFrequency(int n, int shift) const; int m_blockSize; int m_columnCount; @@ -125,8 +158,11 @@ bool m_haveStartTime; mutable int m_notesOutputNo; + mutable int m_onsetsOutputNo; + mutable int m_onOffsetsOutputNo; mutable int m_fcqOutputNo; mutable int m_pitchOutputNo; + mutable int m_templateOutputNo; mutable int m_chromaOutputNo; };
--- a/testdata/TRIOS-silvet/brahms/horn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/horn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,79 +1,43 @@ -12.800000000 12.880000000 493.883 -12.800000000 12.880000000 523.251 -12.800000000 12.920000000 233.082 -13.120000000 13.200000000 932.328 -13.920000000 14.240000000 932.328 -12.840000000 14.520000000 466.164 -14.280000000 15.640000000 415.305 -16.600000000 16.720000000 739.989 -16.840000000 16.920000000 391.995 -16.080000000 16.960000000 369.994 -16.800000000 17.320000000 415.305 -17.560000000 17.720000000 739.989 -17.840000000 17.920000000 739.989 -17.200000000 18.120000000 369.994 -18.000000000 18.120000000 698.456 -18.600000000 18.680000000 698.456 -18.760000000 18.880000000 698.456 -17.960000000 18.960000000 349.228 -18.760000000 19.240000000 369.994 -19.360000000 19.440000000 92.4986 -19.720000000 19.920000000 261.626 -19.280000000 19.960000000 184.997 -19.400000000 19.960000000 195.998 -19.880000000 19.960000000 349.228 -20.640000000 20.880000000 739.989 -20.920000000 21.200000000 739.989 -19.880000000 21.400000000 369.994 -22.240000000 22.360000000 932.328 -22.840000000 22.920000000 523.251 -22.080000000 22.960000000 466.164 -22.840000000 23.320000000 493.883 -23.320000000 23.480000000 233.082 -23.160000000 23.640000000 466.164 -23.960000000 24.040000000 391.995 -23.520000000 24.400000000 415.305 -24.760000000 24.840000000 932.328 -24.320000000 25.000000000 466.164 -24.760000000 25.280000000 415.305 -25.400000000 25.520000000 739.989 -25.800000000 25.920000000 739.989 -25.160000000 26.280000000 369.994 -28.280000000 29.440000000 932.328 -29.800000000 29.880000000 932.328 -27.800000000 30.240000000 466.164 -30.040000000 30.640000000 415.305 -31.040000000 31.920000000 369.994 -31.800000000 32.280000000 415.305 -32.520000000 32.640000000 391.995 -32.160000000 32.680000000 369.994 -32.920000000 33.000000000 369.994 -33.200000000 33.400000000 698.456 -32.560000000 33.480000000 349.228 -33.320000000 33.840000000 369.994 -34.080000000 34.160000000 698.456 -34.320000000 34.440000000 698.456 -33.760000000 34.640000000 349.228 -35.000000000 35.080000000 622.254 -35.200000000 35.760000000 932.328 -34.440000000 36.160000000 311.127 -36.040000000 36.160000000 587.33 -36.000000000 36.640000000 277.183 -37.080000000 37.960000000 246.942 -37.760000000 37.960000000 261.626 -37.840000000 38.440000000 277.183 -38.240000000 38.520000000 246.942 -38.800000000 39.080000000 277.183 -39.200000000 39.320000000 523.251 -38.240000000 39.520000000 261.626 -39.360000000 39.840000000 293.665 -39.760000000 40.720000000 261.626 -40.600000000 41.200000000 233.082 -47.800000000 47.880000000 739.989 -47.840000000 47.920000000 523.251 -47.840000000 47.920000000 622.254 -48.080000000 48.160000000 1244.51 -48.160000000 48.240000000 246.942 -48.160000000 48.240000000 277.183 -48.160000000 48.240000000 329.628 -48.160000000 48.240000000 1108.73 +12.780000000 12.900000000 523.251 +13.040000000 13.160000000 932.328 +12.780000000 14.440000000 466.164 +14.320000000 15.560000000 415.305 +16.160000000 16.820000000 369.994 +16.900000000 17.240000000 415.305 +17.260000000 18.020000000 369.994 +17.980000000 18.860000000 349.228 +18.860000000 19.060000000 369.994 +19.420000000 19.780000000 184.997 +19.680000000 19.880000000 195.998 +19.960000000 21.240000000 369.994 +22.080000000 22.840000000 466.164 +22.840000000 23.260000000 493.883 +23.180000000 23.560000000 466.164 +23.560000000 24.340000000 415.305 +24.380000000 24.900000000 466.164 +24.800000000 25.200000000 415.305 +25.200000000 25.960000000 369.994 +28.560000000 28.860000000 932.328 +29.000000000 29.120000000 932.328 +27.840000000 30.160000000 466.164 +30.100000000 30.560000000 415.305 +31.100000000 31.360000000 369.994 +31.480000000 31.760000000 369.994 +31.840000000 32.200000000 415.305 +32.220000000 32.540000000 369.994 +32.600000000 33.380000000 349.228 +33.380000000 33.740000000 369.994 +33.760000000 34.540000000 349.228 +34.460000000 36.080000000 311.127 +36.040000000 36.520000000 277.183 +37.180000000 37.920000000 246.942 +37.780000000 37.920000000 261.626 +37.900000000 38.320000000 277.183 +38.300000000 38.520000000 246.942 +38.420000000 38.840000000 261.626 +38.840000000 38.980000000 277.183 +38.860000000 39.380000000 261.626 +39.420000000 39.780000000 293.665 +40.260000000 40.380000000 523.251 +39.780000000 40.640000000 261.626 +40.700000000 40.940000000 233.082
--- a/testdata/TRIOS-silvet/brahms/horn_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/horn_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,52 +1,34 @@ -12.880000000 14.520000000 466.164 -14.360000000 15.760000000 415.305 -16.320000000 16.400000000 739.989 -16.640000000 16.760000000 739.989 -16.080000000 17.000000000 369.994 -16.880000000 17.320000000 415.305 -17.280000000 17.400000000 739.989 -17.440000000 17.720000000 739.989 -18.000000000 18.080000000 698.456 -17.200000000 18.120000000 369.994 -18.000000000 19.000000000 349.228 -18.800000000 19.240000000 369.994 -19.480000000 19.560000000 554.365 -19.400000000 20.000000000 184.997 -20.360000000 20.520000000 739.989 -20.640000000 20.720000000 739.989 -19.880000000 21.480000000 369.994 -22.080000000 22.960000000 466.164 -22.840000000 23.320000000 493.883 -23.200000000 23.680000000 466.164 -23.560000000 24.480000000 415.305 -24.360000000 24.920000000 466.164 -25.240000000 25.360000000 391.995 -24.760000000 25.360000000 415.305 -25.440000000 25.520000000 739.989 -25.520000000 25.680000000 391.995 -25.840000000 25.920000000 739.989 -25.200000000 26.360000000 369.994 -26.240000000 26.400000000 739.989 -27.800000000 30.320000000 466.164 -30.080000000 30.800000000 415.305 -31.320000000 31.560000000 739.989 -31.800000000 31.880000000 739.989 -31.040000000 31.960000000 369.994 -31.840000000 32.320000000 415.305 -32.440000000 32.600000000 739.989 -32.200000000 32.680000000 369.994 -32.600000000 33.520000000 349.228 -33.360000000 33.840000000 369.994 -33.760000000 34.640000000 349.228 -34.480000000 36.160000000 311.127 -36.040000000 36.800000000 277.183 -37.120000000 38.000000000 246.942 -37.880000000 38.440000000 277.183 -38.240000000 38.720000000 246.942 -38.560000000 39.560000000 261.626 -39.360000000 39.960000000 293.665 -39.800000000 40.800000000 261.626 -40.640000000 40.840000000 246.942 -40.640000000 41.440000000 233.082 -47.880000000 47.960000000 466.164 -47.880000000 47.960000000 554.365 +12.780000000 14.480000000 466.164 +14.380000000 15.700000000 415.305 +16.120000000 16.920000000 369.994 +16.920000000 17.280000000 415.305 +17.240000000 18.060000000 369.994 +18.000000000 18.980000000 349.228 +18.840000000 19.180000000 369.994 +19.480000000 19.980000000 184.997 +19.920000000 21.400000000 369.994 +22.100000000 22.900000000 466.164 +22.860000000 23.260000000 493.883 +23.200000000 23.640000000 466.164 +23.580000000 24.420000000 415.305 +24.380000000 24.840000000 466.164 +24.800000000 25.280000000 415.305 +25.260000000 25.620000000 369.994 +25.660000000 26.340000000 369.994 +27.800000000 30.240000000 466.164 +30.120000000 30.720000000 415.305 +31.160000000 31.760000000 369.994 +32.260000000 32.600000000 369.994 +32.620000000 33.480000000 349.228 +33.400000000 33.800000000 369.994 +33.760000000 34.580000000 349.228 +34.540000000 36.100000000 311.127 +36.100000000 36.740000000 277.183 +37.160000000 37.980000000 246.942 +37.940000000 38.400000000 277.183 +38.280000000 38.700000000 246.942 +38.620000000 39.500000000 261.626 +39.420000000 39.900000000 293.665 +39.860000000 40.700000000 261.626 +40.840000000 41.080000000 233.082 +41.100000000 41.300000000 233.082
--- a/testdata/TRIOS-silvet/brahms/mix.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/mix.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,300 +1,172 @@ -0.760000000 .960000000 466.164 -1.120000000 1.400000000 233.082 -1.200000000 1.440000000 311.127 -1.880000000 2.200000000 233.082 -1.800000000 2.280000000 311.127 -2.360000000 2.520000000 415.305 -2.560000000 2.640000000 103.826 -2.680000000 2.800000000 311.127 -2.760000000 2.920000000 103.826 -3.120000000 3.200000000 311.127 -3.160000000 3.280000000 103.826 -2.960000000 3.560000000 130.813 -3.640000000 3.760000000 103.826 -3.360000000 3.840000000 311.127 -4.160000000 4.360000000 1244.51 -4.240000000 4.400000000 311.127 -4.160000000 4.400000000 391.995 -4.400000000 4.520000000 116.541 -4.480000000 4.600000000 1244.51 -4.520000000 4.760000000 233.082 -4.520000000 4.760000000 391.995 -4.000000000 4.880000000 622.254 -4.800000000 5.000000000 195.998 -4.920000000 5.120000000 415.305 -4.920000000 5.160000000 261.626 -5.000000000 5.160000000 622.254 -4.960000000 5.200000000 1244.51 -5.120000000 5.240000000 195.998 -4.440000000 5.320000000 311.127 +0.740000000 1.040000000 466.164 +1.040000000 1.580000000 233.082 +1.160000000 1.680000000 311.127 +1.580000000 1.700000000 116.541 +1.740000000 1.880000000 77.7817 +1.780000000 2.140000000 311.127 +1.860000000 2.260000000 233.082 +2.160000000 2.340000000 311.127 +2.320000000 2.620000000 415.305 +2.700000000 2.820000000 311.127 +2.560000000 3.300000000 103.826 +3.300000000 3.420000000 155.563 +2.960000000 3.680000000 130.813 +3.380000000 3.820000000 311.127 +3.380000000 3.880000000 103.826 +4.180000000 4.360000000 311.127 +4.140000000 4.360000000 1244.51 +4.160000000 4.440000000 391.995 +4.360000000 4.520000000 116.541 +4.460000000 4.580000000 1244.51 +4.620000000 4.740000000 1244.51 +4.480000000 4.780000000 391.995 +4.520000000 4.880000000 233.082 +3.900000000 4.900000000 622.254 +4.780000000 4.920000000 1244.51 +4.920000000 5.080000000 415.305 +4.900000000 5.120000000 261.626 +4.940000000 5.160000000 622.254 +5.080000000 5.200000000 1244.51 +4.780000000 5.240000000 195.998 +4.480000000 5.320000000 311.127 5.280000000 5.400000000 466.164 -5.360000000 5.600000000 233.082 -5.560000000 5.720000000 174.614 -5.440000000 6.000000000 587.33 -5.960000000 6.080000000 293.665 -6.120000000 6.280000000 587.33 -6.080000000 6.360000000 146.832 -5.520000000 6.760000000 116.541 -7.160000000 7.280000000 415.305 -7.240000000 7.440000000 523.251 -7.080000000 7.640000000 311.127 -7.320000000 7.680000000 103.826 -7.560000000 7.800000000 523.251 -7.800000000 7.920000000 155.563 -7.480000000 8.040000000 130.813 -7.960000000 8.240000000 415.305 -8.240000000 8.400000000 130.813 -7.880000000 8.400000000 311.127 -8.600000000 8.720000000 73.4162 -8.560000000 8.800000000 146.832 -8.920000000 9.040000000 73.4162 -8.400000000 9.040000000 698.456 -8.440000000 9.040000000 1396.91 -9.120000000 9.400000000 146.832 -9.160000000 9.600000000 415.305 -9.360000000 9.880000000 174.614 -9.600000000 9.920000000 233.082 -10.120000000 10.400000000 155.563 -10.640000000 10.720000000 783.991 -10.200000000 10.800000000 311.127 -10.200000000 10.880000000 391.995 -10.840000000 11.080000000 195.998 -10.920000000 11.160000000 311.127 -10.920000000 11.160000000 391.995 -11.040000000 11.200000000 1046.5 -11.160000000 11.240000000 155.563 -11.160000000 11.240000000 195.998 -11.080000000 11.440000000 233.082 -11.800000000 11.960000000 1046.5 -11.680000000 12.000000000 369.994 -10.880000000 12.200000000 523.251 -12.120000000 12.240000000 155.563 -12.360000000 12.520000000 184.997 -12.640000000 12.800000000 261.626 -12.080000000 12.800000000 369.994 -11.680000000 12.840000000 311.127 -12.800000000 12.880000000 493.883 -12.840000000 12.920000000 155.563 -12.920000000 13.040000000 349.228 -13.080000000 13.240000000 349.228 -13.200000000 13.440000000 293.665 -13.280000000 13.440000000 349.228 -13.480000000 13.600000000 233.082 -13.760000000 13.840000000 116.541 -13.320000000 13.960000000 87.3071 -13.920000000 14.040000000 932.328 -13.960000000 14.200000000 293.665 -14.120000000 14.240000000 932.328 -13.840000000 14.280000000 146.832 -12.880000000 14.480000000 466.164 -14.680000000 14.960000000 311.127 -14.840000000 15.360000000 103.826 -15.360000000 15.480000000 155.563 -14.320000000 15.640000000 415.305 -15.400000000 15.720000000 103.826 -15.080000000 15.720000000 123.471 -15.840000000 15.920000000 103.826 -15.840000000 15.920000000 123.471 -15.200000000 16.080000000 311.127 -16.240000000 16.480000000 466.164 -16.320000000 16.560000000 277.183 -16.480000000 16.640000000 233.082 -16.160000000 16.920000000 138.591 -16.080000000 16.920000000 369.994 -16.840000000 17.000000000 184.997 -17.080000000 17.200000000 246.942 -16.080000000 17.240000000 1108.73 -16.840000000 17.280000000 415.305 -17.000000000 17.480000000 311.127 -17.440000000 17.640000000 277.183 -17.520000000 17.920000000 138.591 -17.200000000 18.080000000 369.994 -18.000000000 18.120000000 698.456 -17.400000000 18.240000000 987.767 -18.200000000 18.360000000 103.826 -18.160000000 18.480000000 554.365 -18.000000000 18.720000000 138.591 -18.720000000 18.840000000 69.2957 -18.400000000 18.840000000 174.614 -18.760000000 18.840000000 698.456 -18.000000000 18.920000000 349.228 -19.080000000 19.200000000 138.591 -18.800000000 19.320000000 369.994 -19.120000000 19.320000000 466.164 -19.200000000 19.400000000 277.183 -19.120000000 19.400000000 932.328 -19.400000000 19.480000000 466.164 -19.520000000 19.640000000 138.591 -18.960000000 19.760000000 92.4986 -19.480000000 19.760000000 932.328 -19.640000000 19.920000000 195.998 -19.840000000 20.040000000 277.183 -19.840000000 20.160000000 1108.73 -19.440000000 20.200000000 184.997 -20.200000000 20.320000000 554.365 -19.960000000 20.360000000 233.082 -20.320000000 20.400000000 622.254 -20.480000000 20.560000000 622.254 -20.640000000 20.880000000 739.989 -20.360000000 20.960000000 1244.51 -20.720000000 21.040000000 123.471 -20.920000000 21.080000000 739.989 -21.040000000 21.320000000 415.305 -21.240000000 21.400000000 184.997 -19.920000000 21.400000000 369.994 -21.560000000 21.680000000 207.652 -20.200000000 21.800000000 311.127 -22.120000000 22.240000000 554.365 -22.240000000 22.320000000 184.997 -21.960000000 22.360000000 138.591 -22.320000000 22.400000000 554.365 -22.480000000 22.640000000 184.997 -22.640000000 22.760000000 739.989 -22.680000000 22.800000000 184.997 -22.080000000 22.840000000 466.164 -22.880000000 23.000000000 415.305 -22.960000000 23.160000000 830.609 -22.640000000 23.280000000 233.082 -22.920000000 23.320000000 138.591 -22.840000000 23.320000000 493.883 -23.320000000 23.520000000 739.989 -23.200000000 23.560000000 466.164 -23.440000000 23.720000000 146.832 -23.680000000 23.800000000 493.883 -23.680000000 23.840000000 739.989 -23.680000000 23.880000000 1396.91 -23.840000000 23.960000000 116.541 -24.040000000 24.120000000 739.989 -24.080000000 24.160000000 1396.91 -23.880000000 24.320000000 146.832 -23.560000000 24.560000000 415.305 -24.440000000 24.840000000 233.082 -24.760000000 24.840000000 932.328 -24.360000000 24.920000000 466.164 -24.920000000 25.160000000 155.563 -24.760000000 25.200000000 415.305 -25.200000000 25.360000000 698.456 -25.320000000 25.400000000 116.541 -25.200000000 25.440000000 1396.91 -25.440000000 25.600000000 311.127 -25.400000000 25.600000000 698.456 -25.600000000 25.680000000 739.989 -25.800000000 25.920000000 932.328 -25.040000000 26.160000000 369.994 -25.760000000 26.160000000 466.164 -25.840000000 26.240000000 233.082 -26.200000000 26.280000000 987.767 -26.160000000 26.400000000 493.883 -26.480000000 26.560000000 739.989 -26.480000000 26.640000000 155.563 -26.160000000 26.720000000 622.254 -26.720000000 26.840000000 987.767 -26.920000000 27.040000000 698.456 -26.880000000 27.080000000 155.563 -26.960000000 27.120000000 987.767 -27.040000000 27.200000000 311.127 -27.160000000 27.280000000 207.652 -26.880000000 27.320000000 349.228 -26.480000000 27.680000000 103.826 -27.440000000 27.800000000 246.942 -27.960000000 28.040000000 293.665 -28.040000000 28.160000000 622.254 -28.040000000 28.240000000 155.563 -27.840000000 28.320000000 466.164 -28.320000000 28.400000000 155.563 -28.400000000 28.480000000 622.254 -28.480000000 28.640000000 184.997 -28.160000000 29.000000000 369.994 -28.760000000 29.040000000 349.228 -29.040000000 29.160000000 932.328 -29.040000000 29.200000000 369.994 -28.200000000 29.280000000 233.082 -29.280000000 29.400000000 155.563 -29.160000000 29.400000000 622.254 -28.360000000 29.440000000 466.164 -29.400000000 29.480000000 233.082 -29.400000000 29.640000000 369.994 -29.480000000 29.720000000 466.164 -29.720000000 29.840000000 233.082 -29.520000000 29.840000000 277.183 -29.720000000 29.960000000 369.994 -29.960000000 30.040000000 1108.73 -29.520000000 30.080000000 554.365 -29.840000000 30.160000000 466.164 -30.080000000 30.320000000 415.305 -30.280000000 30.400000000 174.614 -30.240000000 30.440000000 622.254 -30.440000000 30.520000000 277.183 -30.440000000 30.520000000 415.305 -30.240000000 30.600000000 207.652 -28.040000000 30.840000000 311.127 -30.680000000 30.840000000 554.365 -30.680000000 31.080000000 277.183 -31.240000000 31.480000000 233.082 -31.640000000 31.800000000 311.127 -31.080000000 31.880000000 369.994 -31.800000000 31.920000000 554.365 -31.880000000 32.040000000 184.997 -31.960000000 32.040000000 349.228 -32.040000000 32.120000000 1046.5 -31.800000000 32.240000000 415.305 -32.200000000 32.560000000 369.994 -32.400000000 32.640000000 311.127 -32.680000000 33.000000000 277.183 -33.000000000 33.080000000 116.541 -33.080000000 33.200000000 466.164 -33.080000000 33.280000000 277.183 -33.200000000 33.320000000 698.456 -33.040000000 33.400000000 233.082 -32.600000000 33.400000000 349.228 -33.440000000 33.720000000 311.127 -33.320000000 33.800000000 369.994 -33.760000000 33.840000000 174.614 -33.760000000 33.880000000 233.082 -34.080000000 34.160000000 698.456 -34.320000000 34.440000000 207.652 -34.320000000 34.440000000 698.456 -33.760000000 34.520000000 277.183 -33.800000000 34.560000000 349.228 -34.560000000 34.720000000 415.305 -34.520000000 34.800000000 207.652 -34.720000000 34.800000000 246.942 -34.400000000 34.880000000 116.541 -34.800000000 35.000000000 155.563 -34.880000000 35.000000000 466.164 -34.920000000 35.040000000 415.305 -35.000000000 35.120000000 246.942 -35.080000000 35.160000000 207.652 -35.120000000 35.360000000 123.471 -34.880000000 35.360000000 233.082 -35.280000000 35.680000000 207.652 -35.600000000 35.720000000 554.365 -35.560000000 35.760000000 369.994 -35.720000000 35.920000000 116.541 -35.800000000 36.000000000 207.652 -34.480000000 36.120000000 311.127 -35.960000000 36.280000000 369.994 -36.040000000 36.520000000 277.183 -36.400000000 36.720000000 207.652 -35.600000000 36.960000000 184.997 -36.720000000 37.000000000 369.994 -37.280000000 37.400000000 415.305 -37.800000000 37.920000000 261.626 -37.160000000 37.960000000 246.942 -37.840000000 38.400000000 277.183 -38.280000000 38.520000000 246.942 -38.360000000 38.600000000 415.305 -38.320000000 38.800000000 261.626 -38.680000000 38.840000000 440 -38.800000000 39.080000000 277.183 -38.880000000 39.240000000 440 -39.240000000 39.360000000 220 -38.840000000 39.440000000 261.626 -39.360000000 39.640000000 233.082 -39.080000000 39.800000000 311.127 -39.360000000 39.840000000 293.665 -39.960000000 40.400000000 466.164 -39.760000000 40.680000000 261.626 -40.640000000 40.880000000 293.665 -40.680000000 41.240000000 233.082 -48.080000000 48.160000000 1567.98 +5.360000000 5.740000000 233.082 +5.660000000 6.020000000 116.541 +5.440000000 6.020000000 587.33 +5.920000000 6.200000000 233.082 +6.100000000 6.260000000 146.832 +6.060000000 6.580000000 116.541 +6.520000000 6.700000000 233.082 +7.220000000 7.440000000 523.251 +7.340000000 7.500000000 103.826 +7.080000000 7.560000000 311.127 +7.540000000 7.760000000 523.251 +7.520000000 7.880000000 130.813 +8.020000000 8.140000000 622.254 +7.940000000 8.200000000 415.305 +8.160000000 8.280000000 103.826 +7.880000000 8.300000000 311.127 +8.440000000 8.720000000 698.456 +8.500000000 8.720000000 1396.91 +8.840000000 8.980000000 73.4162 +8.740000000 8.980000000 698.456 +8.760000000 9.020000000 1396.91 +9.000000000 9.160000000 73.4162 +9.160000000 9.580000000 415.305 +9.340000000 9.880000000 174.614 +9.580000000 9.900000000 233.082 +10.260000000 10.380000000 155.563 +10.200000000 10.740000000 311.127 +10.200000000 10.840000000 391.995 +10.840000000 11.100000000 195.998 +10.940000000 11.160000000 311.127 +11.040000000 11.180000000 1046.5 +10.860000000 11.280000000 523.251 +11.080000000 11.400000000 233.082 +11.720000000 11.900000000 369.994 +11.380000000 12.140000000 523.251 +11.700000000 12.280000000 311.127 +12.340000000 12.520000000 184.997 +12.200000000 12.620000000 369.994 +12.640000000 12.760000000 369.994 +12.460000000 12.820000000 311.127 +13.240000000 13.380000000 293.665 +13.040000000 13.400000000 349.228 +13.420000000 13.760000000 87.3071 +13.980000000 14.100000000 932.328 +14.000000000 14.120000000 293.665 +12.860000000 14.420000000 466.164 +14.740000000 14.880000000 311.127 +15.160000000 15.320000000 123.471 +14.340000000 15.540000000 415.305 +15.460000000 15.880000000 311.127 +16.120000000 16.420000000 369.994 +16.260000000 16.420000000 466.164 +16.520000000 16.680000000 1108.73 +16.640000000 16.760000000 138.591 +16.460000000 16.840000000 369.994 +16.760000000 16.880000000 391.995 +16.760000000 17.180000000 1108.73 +16.900000000 17.220000000 415.305 +17.020000000 17.260000000 311.127 +17.240000000 17.360000000 369.994 +17.640000000 17.780000000 987.767 +17.420000000 17.980000000 369.994 +18.000000000 18.840000000 349.228 +19.140000000 19.300000000 466.164 +19.220000000 19.520000000 92.4986 +19.580000000 19.760000000 932.328 +19.680000000 19.820000000 195.998 +19.400000000 19.940000000 184.997 +19.840000000 20.080000000 1108.73 +19.980000000 20.200000000 233.082 +20.000000000 20.220000000 184.997 +20.060000000 20.840000000 369.994 +20.260000000 20.860000000 311.127 +20.480000000 20.940000000 1244.51 +21.020000000 21.220000000 369.994 +20.980000000 21.700000000 311.127 +22.140000000 22.300000000 554.365 +22.100000000 22.800000000 466.164 +22.680000000 22.840000000 233.082 +22.860000000 23.220000000 493.883 +23.240000000 23.520000000 466.164 +23.600000000 24.340000000 415.305 +24.480000000 24.740000000 233.082 +24.500000000 24.740000000 466.164 +24.800000000 25.160000000 415.305 +25.060000000 25.200000000 369.994 +25.240000000 25.880000000 369.994 +25.760000000 25.940000000 466.164 +25.940000000 26.140000000 233.082 +26.160000000 26.360000000 622.254 +26.180000000 26.380000000 493.883 +26.740000000 26.880000000 103.826 +28.280000000 28.460000000 466.164 +28.480000000 28.600000000 466.164 +28.640000000 28.780000000 466.164 +28.540000000 28.960000000 233.082 +28.020000000 29.000000000 311.127 +28.840000000 29.020000000 466.164 +29.020000000 29.260000000 233.082 +29.160000000 29.280000000 622.254 +29.140000000 29.480000000 466.164 +29.160000000 29.540000000 311.127 +29.820000000 29.960000000 466.164 +30.260000000 30.400000000 622.254 +30.260000000 30.680000000 311.127 +31.100000000 31.340000000 369.994 +31.500000000 31.720000000 369.994 +31.860000000 32.140000000 415.305 +32.320000000 32.460000000 369.994 +32.620000000 32.920000000 349.228 +32.700000000 32.960000000 277.183 +33.120000000 33.260000000 277.183 +33.040000000 33.340000000 233.082 +32.980000000 33.340000000 349.228 +33.460000000 33.660000000 311.127 +33.480000000 33.720000000 369.994 +33.880000000 34.240000000 277.183 +34.260000000 34.460000000 277.183 +33.800000000 34.460000000 349.228 +34.540000000 34.680000000 415.305 +34.680000000 34.800000000 207.652 +34.860000000 35.300000000 233.082 +35.580000000 35.800000000 184.997 +35.920000000 36.040000000 184.997 +34.500000000 36.060000000 311.127 +35.940000000 36.160000000 369.994 +36.060000000 36.480000000 277.183 +36.760000000 36.880000000 369.994 +37.200000000 37.480000000 246.942 +37.540000000 37.920000000 246.942 +37.900000000 38.300000000 277.183 +38.340000000 38.480000000 246.942 +38.440000000 38.900000000 261.626 +38.880000000 39.000000000 277.183 +39.080000000 39.200000000 311.127 +39.040000000 39.320000000 440 +38.980000000 39.380000000 261.626 +39.440000000 39.760000000 293.665 +39.800000000 40.620000000 261.626 +40.740000000 41.200000000 233.082
--- a/testdata/TRIOS-silvet/brahms/piano.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/piano.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,258 +1,159 @@ -0.760000000 1.000000000 466.164 -1.080000000 1.400000000 233.082 -1.200000000 1.440000000 311.127 -1.880000000 2.200000000 233.082 -1.800000000 2.280000000 311.127 -2.320000000 2.520000000 415.305 -2.560000000 2.640000000 103.826 -2.680000000 2.800000000 311.127 -2.760000000 2.920000000 103.826 -3.000000000 3.120000000 103.826 -3.120000000 3.240000000 311.127 -3.160000000 3.280000000 103.826 -3.240000000 3.400000000 155.563 -2.960000000 3.600000000 130.813 -3.640000000 3.800000000 103.826 -3.360000000 3.840000000 311.127 -4.240000000 4.320000000 311.127 -4.360000000 4.560000000 116.541 -4.680000000 4.800000000 116.541 -4.520000000 4.800000000 233.082 -4.160000000 4.800000000 391.995 +0.740000000 1.120000000 466.164 +1.100000000 1.580000000 233.082 +1.160000000 1.680000000 311.127 +1.580000000 1.700000000 116.541 +1.840000000 2.260000000 233.082 +2.180000000 2.300000000 77.7817 +1.760000000 2.340000000 311.127 +2.300000000 2.620000000 415.305 +2.600000000 2.720000000 155.563 +2.660000000 2.840000000 311.127 +2.600000000 3.260000000 103.826 +3.260000000 3.420000000 155.563 +2.960000000 3.660000000 130.813 +3.380000000 3.800000000 311.127 +3.340000000 3.860000000 103.826 +4.200000000 4.360000000 311.127 +4.360000000 4.520000000 116.541 +4.160000000 4.840000000 391.995 +4.480000000 4.900000000 233.082 +4.900000000 5.160000000 261.626 4.920000000 5.160000000 415.305 -4.920000000 5.240000000 261.626 -4.760000000 5.280000000 195.998 -4.480000000 5.360000000 311.127 +4.780000000 5.260000000 195.998 +4.480000000 5.320000000 311.127 5.280000000 5.400000000 466.164 -5.360000000 5.600000000 233.082 -5.560000000 5.640000000 293.665 -5.520000000 5.840000000 174.614 -5.880000000 5.960000000 233.082 -6.040000000 6.400000000 146.832 -5.520000000 6.760000000 116.541 -7.160000000 7.280000000 415.305 -7.080000000 7.680000000 311.127 -7.320000000 7.760000000 103.826 -7.800000000 7.920000000 155.563 -7.960000000 8.240000000 415.305 -8.200000000 8.320000000 103.826 -8.120000000 8.320000000 207.652 -7.880000000 8.400000000 311.127 -7.480000000 8.440000000 130.813 -8.600000000 8.720000000 73.4162 -8.520000000 8.800000000 146.832 -8.920000000 9.040000000 73.4162 -9.080000000 9.400000000 146.832 -9.360000000 9.920000000 174.614 +5.300000000 6.180000000 233.082 +6.060000000 6.340000000 146.832 +5.640000000 6.640000000 116.541 +6.500000000 6.720000000 233.082 +7.140000000 7.260000000 415.305 +7.320000000 7.440000000 103.826 +7.080000000 7.580000000 311.127 +7.480000000 7.620000000 103.826 +7.520000000 7.940000000 130.813 +7.940000000 8.240000000 415.305 +7.880000000 8.340000000 311.127 +8.080000000 8.360000000 103.826 +8.580000000 8.720000000 146.832 +8.720000000 8.840000000 73.4162 +9.200000000 9.400000000 146.832 +9.280000000 9.900000000 174.614 9.600000000 9.920000000 233.082 -10.120000000 10.400000000 155.563 -10.200000000 10.520000000 391.995 -10.680000000 10.800000000 77.7817 -10.200000000 10.800000000 311.127 +10.140000000 10.380000000 155.563 +10.180000000 10.560000000 391.995 +10.200000000 10.740000000 311.127 +10.640000000 10.860000000 77.7817 10.920000000 11.160000000 311.127 -10.960000000 11.160000000 391.995 -11.160000000 11.240000000 155.563 -10.840000000 11.240000000 195.998 -11.200000000 11.280000000 77.7817 -11.080000000 11.440000000 233.082 -11.600000000 11.720000000 110 -11.680000000 12.120000000 369.994 -12.120000000 12.280000000 155.563 -12.320000000 12.560000000 184.997 -12.440000000 12.680000000 369.994 -12.640000000 12.840000000 261.626 -11.680000000 12.920000000 311.127 -13.200000000 13.480000000 293.665 -13.760000000 13.920000000 116.541 -13.280000000 14.000000000 87.3071 -14.080000000 14.160000000 87.3071 -13.840000000 14.280000000 146.832 -14.280000000 14.400000000 174.614 -13.960000000 14.400000000 293.665 -14.400000000 14.520000000 87.3071 -14.640000000 14.720000000 123.471 -14.760000000 14.840000000 415.305 -14.680000000 15.080000000 311.127 -14.800000000 15.360000000 103.826 -15.360000000 15.480000000 155.563 -15.520000000 15.680000000 415.305 -15.400000000 15.720000000 103.826 -15.040000000 15.760000000 123.471 -15.840000000 15.920000000 103.826 -15.840000000 15.960000000 123.471 -15.200000000 16.080000000 311.127 -16.240000000 16.480000000 466.164 -16.320000000 16.560000000 277.183 -16.280000000 16.640000000 369.994 -16.480000000 16.720000000 233.082 -16.120000000 16.960000000 138.591 -16.840000000 17.080000000 184.997 -17.120000000 17.280000000 415.305 -17.080000000 17.400000000 246.942 -17.000000000 17.480000000 311.127 -17.520000000 17.640000000 207.652 -17.440000000 17.760000000 277.183 -17.360000000 17.840000000 369.994 -17.760000000 18.000000000 69.2957 -17.840000000 18.120000000 103.826 -18.200000000 18.480000000 103.826 -18.400000000 18.520000000 174.614 -18.120000000 18.560000000 554.365 -18.120000000 18.600000000 349.228 -17.520000000 18.720000000 138.591 -18.720000000 18.800000000 69.2957 -18.600000000 18.840000000 174.614 -19.040000000 19.200000000 138.591 -19.160000000 19.320000000 369.994 -19.120000000 19.320000000 466.164 -19.200000000 19.400000000 277.183 -19.400000000 19.480000000 466.164 -19.400000000 19.560000000 554.365 -19.480000000 19.680000000 138.591 -19.640000000 19.760000000 277.183 -18.960000000 19.800000000 92.4986 -19.880000000 19.960000000 92.4986 -19.840000000 20.000000000 369.994 -19.840000000 20.080000000 277.183 -19.720000000 20.240000000 184.997 -20.240000000 20.320000000 554.365 -20.280000000 20.400000000 92.4986 -19.960000000 20.400000000 233.082 -20.320000000 20.400000000 622.254 -20.320000000 20.480000000 369.994 -20.720000000 21.160000000 123.471 -21.040000000 21.280000000 415.305 -21.240000000 21.440000000 184.997 -21.040000000 21.440000000 369.994 -21.520000000 21.600000000 415.305 -21.560000000 21.680000000 207.652 -20.200000000 21.800000000 311.127 -22.120000000 22.240000000 554.365 -22.240000000 22.320000000 184.997 -22.080000000 22.560000000 466.164 -22.320000000 22.600000000 554.365 -21.960000000 22.680000000 138.591 -22.480000000 22.800000000 184.997 -22.880000000 23.040000000 415.305 -22.800000000 23.080000000 493.883 -23.120000000 23.200000000 184.997 -22.640000000 23.280000000 233.082 -23.160000000 23.280000000 493.883 -22.840000000 23.320000000 138.591 -23.400000000 23.720000000 146.832 -23.640000000 23.760000000 73.4162 -23.680000000 23.840000000 493.883 -23.600000000 23.880000000 415.305 -23.800000000 24.000000000 116.541 -23.920000000 24.000000000 493.883 -23.840000000 24.320000000 146.832 -24.320000000 24.560000000 466.164 -24.360000000 24.640000000 415.305 -24.520000000 24.680000000 174.614 -24.360000000 24.800000000 233.082 -24.920000000 25.160000000 155.563 -25.040000000 25.200000000 77.7817 -25.160000000 25.240000000 739.989 -25.240000000 25.400000000 116.541 -25.440000000 25.520000000 739.989 -25.440000000 25.600000000 311.127 -25.600000000 25.680000000 739.989 -25.720000000 25.880000000 155.563 -25.800000000 25.920000000 932.328 -25.040000000 26.160000000 369.994 -25.760000000 26.160000000 466.164 -25.840000000 26.240000000 233.082 -26.200000000 26.280000000 987.767 -26.160000000 26.400000000 493.883 -26.480000000 26.560000000 739.989 -26.480000000 26.640000000 155.563 -26.160000000 26.720000000 622.254 -26.720000000 26.840000000 987.767 -26.920000000 27.040000000 698.456 -26.880000000 27.160000000 155.563 -26.960000000 27.160000000 987.767 -27.040000000 27.200000000 311.127 -27.160000000 27.280000000 207.652 -26.880000000 27.360000000 349.228 -27.440000000 27.600000000 311.127 -26.440000000 27.680000000 103.826 -27.720000000 27.840000000 103.826 -27.440000000 27.880000000 246.942 -27.880000000 27.960000000 622.254 -27.960000000 28.040000000 293.665 -28.040000000 28.200000000 622.254 -27.960000000 28.240000000 116.541 -28.280000000 28.360000000 233.082 -28.400000000 28.560000000 622.254 -28.440000000 28.680000000 184.997 -28.760000000 29.160000000 349.228 -28.560000000 29.240000000 233.082 -29.160000000 29.520000000 622.254 -29.600000000 29.680000000 1108.73 -29.720000000 29.840000000 116.541 -29.480000000 30.000000000 277.183 -29.920000000 30.040000000 1108.73 -29.520000000 30.080000000 554.365 -30.280000000 30.400000000 174.614 -30.240000000 30.440000000 207.652 -30.240000000 30.440000000 622.254 -30.400000000 30.560000000 277.183 -28.040000000 30.840000000 311.127 -30.680000000 30.840000000 554.365 -30.680000000 31.080000000 277.183 -31.200000000 31.520000000 233.082 -31.280000000 31.520000000 554.365 -31.640000000 31.720000000 233.082 -31.720000000 31.840000000 184.997 -31.800000000 31.920000000 246.942 -31.800000000 31.920000000 554.365 -31.880000000 32.080000000 184.997 -32.720000000 33.080000000 116.541 -33.080000000 33.200000000 466.164 -33.080000000 33.320000000 138.591 -33.040000000 33.440000000 233.082 -33.520000000 33.680000000 138.591 -33.680000000 33.920000000 233.082 -34.160000000 34.320000000 415.305 -34.600000000 34.720000000 415.305 -34.600000000 34.760000000 123.471 -34.200000000 34.840000000 207.652 -34.280000000 34.880000000 116.541 -34.800000000 34.960000000 155.563 -34.880000000 35.000000000 466.164 -34.760000000 35.080000000 415.305 -35.040000000 35.120000000 622.254 -35.080000000 35.160000000 207.652 -35.200000000 35.320000000 415.305 -35.000000000 35.360000000 123.471 -34.880000000 35.360000000 233.082 -35.280000000 35.400000000 1046.5 -35.400000000 35.480000000 415.305 -35.480000000 35.560000000 293.665 -35.240000000 35.680000000 207.652 -35.600000000 35.720000000 554.365 -35.560000000 35.800000000 369.994 -35.640000000 35.840000000 415.305 -35.680000000 36.000000000 116.541 -35.800000000 36.040000000 207.652 -35.960000000 36.040000000 554.365 -36.080000000 36.200000000 138.591 -36.160000000 36.240000000 554.365 -36.160000000 36.280000000 233.082 -36.240000000 36.320000000 207.652 -35.920000000 36.400000000 369.994 -36.360000000 36.600000000 138.591 -36.400000000 36.720000000 207.652 -36.720000000 37.000000000 369.994 -35.600000000 37.040000000 184.997 -37.240000000 37.320000000 184.997 -37.080000000 37.640000000 116.541 -37.680000000 37.760000000 174.614 -37.800000000 38.040000000 233.082 -38.080000000 38.240000000 116.541 -38.600000000 39.080000000 116.541 -39.360000000 39.480000000 233.082 -39.040000000 39.760000000 311.127 -40.640000000 40.880000000 293.665 -40.960000000 41.240000000 233.082 -48.120000000 48.200000000 65.4064 +10.980000000 11.160000000 391.995 +10.820000000 11.280000000 195.998 +11.080000000 11.420000000 233.082 +11.600000000 11.740000000 110 +11.720000000 12.080000000 369.994 +11.680000000 12.360000000 311.127 +12.480000000 12.640000000 369.994 +12.640000000 12.780000000 261.626 +12.440000000 12.860000000 311.127 +12.320000000 12.920000000 184.997 +13.200000000 13.440000000 293.665 +13.300000000 13.960000000 87.3071 +13.860000000 14.220000000 146.832 +13.980000000 14.360000000 293.665 +14.320000000 14.540000000 87.3071 +14.760000000 14.880000000 415.305 +14.680000000 14.940000000 311.127 +15.040000000 15.480000000 123.471 +15.360000000 15.500000000 155.563 +15.480000000 15.740000000 415.305 +15.560000000 15.920000000 123.471 +14.860000000 15.960000000 103.826 +15.240000000 16.080000000 311.127 +16.240000000 16.460000000 466.164 +16.300000000 16.520000000 277.183 +16.300000000 16.600000000 369.994 +16.440000000 16.700000000 233.082 +16.160000000 16.880000000 138.591 +16.840000000 17.020000000 184.997 +17.040000000 17.160000000 415.305 +17.120000000 17.280000000 246.942 +17.000000000 17.420000000 311.127 +17.440000000 17.600000000 277.183 +17.400000000 17.720000000 369.994 +17.580000000 17.800000000 138.591 +17.940000000 18.140000000 103.826 +18.140000000 18.280000000 554.365 +18.160000000 18.400000000 349.228 +18.320000000 18.480000000 554.365 +17.940000000 18.680000000 138.591 +18.560000000 18.700000000 174.614 +19.160000000 19.300000000 369.994 +19.140000000 19.360000000 466.164 +19.300000000 19.420000000 277.183 +19.000000000 19.580000000 92.4986 +19.520000000 19.640000000 138.591 +19.760000000 19.960000000 184.997 +19.860000000 19.980000000 277.183 +19.960000000 20.360000000 233.082 +20.280000000 20.420000000 369.994 +20.780000000 21.020000000 123.471 +21.020000000 21.180000000 369.994 +20.220000000 21.740000000 311.127 +22.120000000 22.320000000 554.365 +22.100000000 22.360000000 466.164 +22.540000000 22.660000000 184.997 +22.700000000 22.900000000 233.082 +22.820000000 22.940000000 493.883 +23.020000000 23.140000000 233.082 +23.480000000 23.600000000 146.832 +24.340000000 24.460000000 466.164 +24.460000000 24.740000000 233.082 +25.100000000 25.320000000 77.7817 +25.060000000 25.780000000 369.994 +25.760000000 25.880000000 466.164 +25.780000000 25.900000000 932.328 +25.860000000 26.180000000 233.082 +26.160000000 26.400000000 622.254 +26.180000000 26.420000000 493.883 +26.440000000 26.560000000 622.254 +26.720000000 26.880000000 103.826 +26.920000000 27.040000000 349.228 +27.080000000 27.220000000 103.826 +28.400000000 28.520000000 622.254 +28.480000000 28.600000000 184.997 +28.660000000 28.920000000 233.082 +28.800000000 28.920000000 349.228 +28.020000000 28.980000000 311.127 +29.160000000 29.300000000 622.254 +29.160000000 29.500000000 311.127 +29.520000000 29.760000000 277.183 +29.900000000 30.020000000 554.365 +29.960000000 30.100000000 311.127 +30.260000000 30.380000000 622.254 +30.160000000 30.760000000 311.127 +30.700000000 30.820000000 554.365 +30.800000000 31.020000000 277.183 +31.880000000 32.000000000 184.997 +33.040000000 33.360000000 233.082 +33.700000000 33.820000000 233.082 +34.180000000 34.300000000 207.652 +34.380000000 34.560000000 233.082 +34.500000000 34.640000000 415.305 +34.640000000 34.800000000 123.471 +34.380000000 34.820000000 207.652 +34.720000000 34.880000000 415.305 +34.780000000 34.960000000 311.127 +34.860000000 34.980000000 466.164 +35.040000000 35.320000000 123.471 +34.840000000 35.340000000 233.082 +35.340000000 35.480000000 415.305 +35.240000000 35.600000000 207.652 +35.580000000 35.760000000 369.994 +35.940000000 36.200000000 369.994 +35.560000000 36.480000000 184.997 +36.540000000 36.740000000 207.652 +36.720000000 36.920000000 369.994 +36.720000000 37.000000000 184.997 +39.040000000 39.740000000 311.127 +40.460000000 40.660000000 311.127 +40.720000000 40.880000000 311.127 +40.640000000 40.920000000 293.665 +40.920000000 41.320000000 233.082
--- a/testdata/TRIOS-silvet/brahms/piano_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/piano_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,340 +1,195 @@ -0.720000000 1.120000000 466.164 -1.080000000 1.240000000 587.33 -1.120000000 1.400000000 233.082 -1.240000000 1.440000000 311.127 -1.760000000 1.920000000 466.164 -1.800000000 2.000000000 311.127 -1.920000000 2.040000000 155.563 -2.040000000 2.160000000 391.995 -1.040000000 2.200000000 116.541 -2.160000000 2.280000000 155.563 -2.000000000 2.360000000 195.998 -1.880000000 2.360000000 233.082 -2.280000000 2.360000000 391.995 -0.920000000 2.400000000 77.7817 -2.280000000 2.680000000 415.305 -2.640000000 2.720000000 110 -2.680000000 2.800000000 311.127 -2.720000000 2.920000000 523.251 -2.840000000 3.240000000 311.127 -3.000000000 3.400000000 130.813 -2.480000000 3.480000000 103.826 -2.960000000 3.560000000 391.995 -3.520000000 3.600000000 207.652 -3.600000000 3.680000000 103.826 -3.560000000 3.680000000 130.813 -2.680000000 3.920000000 261.626 -3.760000000 3.920000000 391.995 -3.480000000 3.920000000 415.305 -3.240000000 3.960000000 155.563 -3.680000000 4.000000000 207.652 +0.720000000 1.180000000 466.164 +1.060000000 1.220000000 587.33 +1.280000000 1.480000000 311.127 +1.180000000 1.520000000 233.082 +1.020000000 2.060000000 116.541 +1.880000000 2.180000000 233.082 +2.200000000 2.340000000 233.082 +2.040000000 2.380000000 195.998 +1.020000000 2.400000000 77.7817 +2.280000000 2.620000000 415.305 +2.700000000 3.000000000 261.626 +3.000000000 3.220000000 130.813 +2.520000000 3.320000000 103.826 +3.180000000 3.380000000 391.995 +3.260000000 3.460000000 155.563 +3.260000000 3.520000000 130.813 +3.400000000 3.700000000 261.626 +3.520000000 3.780000000 415.305 +3.700000000 3.840000000 130.813 +3.480000000 3.860000000 155.563 +3.760000000 3.900000000 207.652 4.200000000 4.320000000 233.082 -4.240000000 4.400000000 466.164 -4.240000000 4.440000000 311.127 -4.360000000 4.520000000 830.609 -4.440000000 4.640000000 466.164 -4.600000000 4.680000000 233.082 -4.720000000 4.840000000 466.164 -4.160000000 4.920000000 391.995 -4.760000000 5.000000000 195.998 -4.920000000 5.120000000 261.626 -4.840000000 5.240000000 415.305 -4.440000000 5.320000000 155.563 -5.280000000 5.400000000 466.164 -5.000000000 5.600000000 233.082 -5.280000000 5.600000000 349.228 -6.040000000 6.120000000 440 -6.040000000 6.320000000 233.082 -5.960000000 6.640000000 146.832 -6.680000000 6.840000000 146.832 -5.960000000 6.840000000 349.228 -6.440000000 6.880000000 233.082 -6.280000000 6.920000000 174.614 -4.000000000 6.960000000 116.541 -7.040000000 7.200000000 329.628 -7.080000000 7.320000000 65.4064 -7.080000000 7.400000000 415.305 -7.440000000 7.560000000 65.4064 -7.120000000 7.560000000 311.127 -7.640000000 7.720000000 261.626 -7.680000000 7.800000000 65.4064 -7.640000000 7.960000000 130.813 -7.960000000 8.040000000 311.127 -7.480000000 8.160000000 391.995 -7.920000000 8.240000000 415.305 -8.040000000 8.400000000 130.813 -8.200000000 8.440000000 391.995 -7.240000000 8.480000000 103.826 -7.720000000 8.480000000 155.563 -8.240000000 8.520000000 207.652 -8.720000000 9.120000000 415.305 -9.200000000 9.400000000 146.832 -8.800000000 9.600000000 116.541 -9.400000000 9.880000000 415.305 -9.360000000 9.920000000 174.614 -8.720000000 9.920000000 349.228 -8.440000000 10.040000000 73.4162 -9.600000000 10.040000000 233.082 -10.240000000 10.320000000 622.254 -10.200000000 10.520000000 391.995 -10.560000000 10.840000000 311.127 -10.040000000 11.000000000 77.7817 -10.600000000 11.040000000 155.563 -10.800000000 11.120000000 195.998 -11.000000000 11.160000000 311.127 -10.920000000 11.160000000 391.995 -11.200000000 11.280000000 77.7817 -10.280000000 11.280000000 116.541 -11.080000000 11.400000000 155.563 -11.160000000 11.440000000 195.998 -11.280000000 11.440000000 391.995 -11.400000000 11.480000000 77.7817 -11.120000000 11.520000000 233.082 -11.720000000 11.920000000 622.254 -11.720000000 12.120000000 311.127 -11.680000000 12.360000000 369.994 -12.360000000 12.480000000 184.997 -12.640000000 12.720000000 523.251 -12.080000000 12.960000000 155.563 -12.800000000 12.960000000 523.251 -12.640000000 13.000000000 261.626 -12.440000000 13.040000000 369.994 -11.480000000 13.080000000 110 -13.200000000 13.280000000 369.994 -13.240000000 13.320000000 698.456 -13.240000000 13.520000000 349.228 -13.240000000 13.720000000 293.665 -13.720000000 13.840000000 587.33 -13.000000000 14.200000000 116.541 -14.000000000 14.280000000 293.665 -13.360000000 14.560000000 87.3071 -13.800000000 14.560000000 146.832 -13.640000000 14.560000000 349.228 -14.720000000 15.080000000 415.305 -14.640000000 15.200000000 311.127 -15.160000000 15.520000000 369.994 -15.520000000 15.600000000 311.127 -14.600000000 15.960000000 123.471 -15.960000000 16.080000000 207.652 -15.880000000 16.120000000 369.994 -15.440000000 16.120000000 415.305 -14.760000000 16.160000000 103.826 -15.320000000 16.160000000 155.563 -16.320000000 16.400000000 739.989 -16.240000000 16.520000000 466.164 -16.440000000 16.560000000 830.609 -16.520000000 16.600000000 233.082 -16.880000000 16.960000000 554.365 -16.360000000 17.040000000 116.541 -16.200000000 17.080000000 369.994 -17.120000000 17.240000000 369.994 -17.280000000 17.400000000 138.591 -17.040000000 17.400000000 311.127 -17.000000000 17.440000000 246.942 -16.120000000 17.480000000 69.2957 -16.640000000 17.640000000 415.305 -17.440000000 17.800000000 277.183 -17.480000000 17.880000000 207.652 -17.920000000 18.120000000 207.652 -17.400000000 18.120000000 369.994 -17.600000000 18.160000000 69.2957 -18.160000000 18.280000000 207.652 -18.320000000 18.400000000 207.652 -18.120000000 18.440000000 277.183 -18.440000000 18.840000000 174.614 -18.120000000 18.920000000 349.228 -18.040000000 18.920000000 415.305 -18.400000000 18.960000000 69.2957 -17.760000000 18.960000000 103.826 -19.160000000 19.240000000 830.609 -19.360000000 19.440000000 830.609 -19.200000000 19.480000000 277.183 -19.120000000 19.520000000 466.164 -19.720000000 19.800000000 184.997 -19.520000000 19.880000000 138.591 -19.840000000 19.920000000 554.365 -19.000000000 19.960000000 92.4986 -19.920000000 20.040000000 277.183 -19.880000000 20.240000000 184.997 -19.480000000 20.240000000 415.305 -20.040000000 20.280000000 92.4986 -20.000000000 20.320000000 233.082 -20.600000000 20.720000000 184.997 -20.760000000 20.840000000 622.254 -20.280000000 21.000000000 311.127 -20.480000000 21.120000000 123.471 -20.920000000 21.200000000 739.989 -21.120000000 21.240000000 311.127 -21.280000000 21.400000000 311.127 -21.240000000 21.440000000 184.997 -19.080000000 21.520000000 369.994 -21.520000000 21.600000000 311.127 -21.480000000 21.720000000 184.997 -21.000000000 21.800000000 155.563 -21.000000000 21.800000000 415.305 -21.480000000 21.880000000 207.652 -22.120000000 22.240000000 554.365 -22.240000000 22.320000000 184.997 -22.240000000 22.360000000 138.591 -22.320000000 22.480000000 554.365 -22.080000000 22.520000000 466.164 -22.400000000 22.640000000 184.997 -22.320000000 22.760000000 415.305 -22.680000000 22.760000000 466.164 -22.480000000 22.840000000 369.994 -22.800000000 23.120000000 493.883 -22.840000000 23.240000000 415.305 -23.000000000 23.320000000 277.183 -21.960000000 23.360000000 69.2957 -22.640000000 23.360000000 233.082 -23.560000000 23.920000000 415.305 -23.680000000 23.960000000 493.883 -24.000000000 24.200000000 146.832 -24.280000000 24.360000000 174.614 -23.680000000 24.440000000 116.541 -24.200000000 24.520000000 349.228 -24.360000000 24.520000000 466.164 -24.520000000 24.600000000 116.541 -24.320000000 24.720000000 415.305 -24.680000000 24.800000000 174.614 -23.360000000 24.840000000 73.4162 -24.560000000 24.840000000 349.228 -24.440000000 24.880000000 233.082 -25.160000000 25.240000000 739.989 -25.440000000 25.560000000 739.989 -24.840000000 25.720000000 77.7817 -25.680000000 25.760000000 554.365 -25.120000000 25.840000000 116.541 -25.480000000 25.960000000 155.563 -25.800000000 26.000000000 932.328 -25.880000000 26.160000000 116.541 -26.000000000 26.160000000 155.563 -25.880000000 26.160000000 466.164 -25.040000000 26.200000000 369.994 -25.960000000 26.240000000 311.127 -26.160000000 26.440000000 493.883 -26.200000000 26.440000000 622.254 -26.160000000 26.560000000 987.767 -26.480000000 26.600000000 493.883 -27.160000000 27.240000000 207.652 -27.240000000 27.680000000 415.305 -26.880000000 27.720000000 349.228 -26.880000000 27.800000000 155.563 -27.360000000 27.880000000 246.942 -26.400000000 27.920000000 103.826 -27.960000000 28.040000000 659.255 -28.040000000 28.280000000 622.254 -28.240000000 28.440000000 349.228 -28.240000000 28.600000000 830.609 -28.600000000 28.680000000 349.228 -28.480000000 28.680000000 554.365 -28.440000000 28.760000000 369.994 -28.760000000 28.840000000 466.164 -28.840000000 28.920000000 698.456 -28.080000000 28.960000000 311.127 -28.680000000 29.040000000 233.082 -28.960000000 29.040000000 293.665 -28.720000000 29.160000000 349.228 -28.920000000 29.200000000 830.609 -29.080000000 29.240000000 233.082 -29.040000000 29.240000000 587.33 -29.240000000 29.320000000 1244.51 -29.320000000 29.440000000 622.254 -29.400000000 29.520000000 659.255 -29.480000000 29.560000000 293.665 -29.560000000 29.720000000 277.183 -29.160000000 29.880000000 311.127 -29.760000000 29.920000000 587.33 -29.640000000 30.040000000 830.609 -30.040000000 30.160000000 277.183 -29.520000000 30.200000000 554.365 -29.920000000 30.360000000 349.228 -29.880000000 30.480000000 174.614 -30.200000000 30.520000000 415.305 -30.400000000 30.560000000 349.228 -30.520000000 30.600000000 587.33 -30.560000000 30.640000000 311.127 -30.520000000 30.680000000 174.614 -30.600000000 30.760000000 415.305 -30.160000000 30.800000000 207.652 -30.720000000 31.000000000 277.183 -30.680000000 31.120000000 554.365 -31.000000000 31.120000000 659.255 -31.040000000 31.160000000 293.665 -31.240000000 31.440000000 349.228 -31.440000000 31.640000000 493.883 -31.160000000 31.640000000 830.609 -31.720000000 31.800000000 830.609 -31.440000000 31.880000000 246.942 -31.800000000 32.000000000 554.365 -32.000000000 32.080000000 184.997 -32.160000000 32.240000000 184.997 -31.720000000 32.280000000 369.994 -32.000000000 32.280000000 830.609 -31.440000000 32.320000000 155.563 -32.240000000 32.480000000 246.942 -32.560000000 32.680000000 659.255 -32.560000000 32.720000000 293.665 -32.760000000 33.000000000 830.609 -33.080000000 33.200000000 466.164 -33.080000000 33.280000000 233.082 -33.280000000 33.760000000 349.228 -33.760000000 33.840000000 293.665 -33.000000000 33.920000000 138.591 -33.840000000 33.920000000 349.228 -33.000000000 33.960000000 415.305 -33.280000000 34.000000000 174.614 -34.080000000 34.160000000 659.255 -34.120000000 34.560000000 415.305 -34.520000000 34.600000000 830.609 -34.600000000 34.720000000 415.305 -34.560000000 34.880000000 369.994 -34.520000000 34.920000000 123.471 -34.880000000 35.000000000 466.164 -35.000000000 35.160000000 233.082 -34.800000000 35.280000000 155.563 -34.920000000 35.280000000 369.994 -35.200000000 35.560000000 415.305 -34.160000000 35.720000000 207.652 -35.760000000 35.920000000 293.665 -36.040000000 36.120000000 138.591 -35.800000000 36.160000000 207.652 -35.560000000 36.640000000 369.994 -35.640000000 36.720000000 415.305 -36.200000000 36.760000000 207.652 -36.800000000 36.920000000 184.997 -36.720000000 37.600000000 369.994 -37.520000000 37.760000000 174.614 -37.800000000 38.040000000 233.082 -37.840000000 38.080000000 174.614 -38.080000000 38.240000000 830.609 -38.000000000 38.360000000 466.164 -37.520000000 38.440000000 349.228 -38.280000000 38.480000000 174.614 -38.800000000 38.960000000 830.609 -38.880000000 39.000000000 174.614 -39.040000000 39.120000000 329.628 -38.800000000 39.120000000 349.228 -39.080000000 39.200000000 622.254 -39.160000000 39.280000000 349.228 -39.280000000 39.360000000 466.164 -39.400000000 39.520000000 349.228 -39.120000000 39.560000000 311.127 -39.240000000 39.640000000 233.082 -39.560000000 39.800000000 830.609 -39.720000000 39.920000000 233.082 -39.800000000 39.920000000 466.164 -39.040000000 40.240000000 155.563 -40.440000000 40.560000000 830.609 -40.760000000 40.880000000 293.665 -40.640000000 40.920000000 440 -40.960000000 41.040000000 466.164 -40.280000000 41.080000000 155.563 -41.000000000 41.280000000 233.082 -41.160000000 41.400000000 466.164 -40.600000000 41.760000000 146.832 -27.760000000 42.160000000 116.541 -47.880000000 48.000000000 587.33 -47.920000000 48.040000000 1244.51 -47.960000000 48.040000000 1760 -47.920000000 48.080000000 1479.98 +4.280000000 4.440000000 311.127 +4.500000000 4.720000000 233.082 +4.180000000 4.780000000 391.995 +4.780000000 4.900000000 195.998 +4.900000000 5.080000000 261.626 +4.880000000 5.160000000 415.305 +5.020000000 5.180000000 155.563 +4.040000000 5.340000000 116.541 +5.280000000 5.500000000 349.228 +4.780000000 5.560000000 233.082 +6.020000000 6.180000000 349.228 +6.060000000 6.300000000 146.832 +6.300000000 6.420000000 174.614 +6.540000000 6.660000000 174.614 +5.440000000 6.740000000 116.541 +6.460000000 6.840000000 233.082 +7.100000000 7.340000000 415.305 +7.340000000 7.660000000 103.826 +7.520000000 7.760000000 391.995 +7.720000000 7.840000000 130.813 +7.820000000 7.980000000 391.995 +7.900000000 8.140000000 415.305 +8.040000000 8.240000000 103.826 +8.040000000 8.340000000 155.563 +8.720000000 8.980000000 415.305 +8.720000000 9.100000000 349.228 +8.880000000 9.220000000 116.541 +9.300000000 9.500000000 174.614 +8.540000000 9.520000000 73.4162 +9.440000000 9.700000000 415.305 +9.440000000 9.740000000 349.228 +9.640000000 9.940000000 73.4162 +9.600000000 9.940000000 233.082 +10.200000000 10.420000000 391.995 +10.120000000 10.820000000 77.7817 +10.340000000 10.840000000 116.541 +10.820000000 10.980000000 195.998 +11.040000000 11.240000000 195.998 +11.160000000 11.300000000 155.563 +11.100000000 11.460000000 233.082 +11.760000000 12.060000000 311.127 +11.700000000 12.320000000 369.994 +12.140000000 12.440000000 155.563 +12.780000000 12.900000000 261.626 +12.480000000 12.920000000 369.994 +11.580000000 13.000000000 110 +13.240000000 13.380000000 349.228 +13.440000000 13.840000000 87.3071 +13.080000000 14.000000000 116.541 +13.900000000 14.020000000 146.832 +14.260000000 14.400000000 87.3071 +14.000000000 14.400000000 349.228 +14.620000000 14.740000000 123.471 +14.760000000 14.880000000 123.471 +14.740000000 14.980000000 415.305 +14.900000000 15.020000000 123.471 +14.920000000 15.340000000 103.826 +15.060000000 15.440000000 123.471 +15.720000000 15.860000000 103.826 +15.740000000 15.940000000 155.563 +15.480000000 16.000000000 415.305 +16.140000000 16.420000000 69.2957 +16.260000000 16.460000000 466.164 +16.280000000 16.660000000 369.994 +16.420000000 16.860000000 116.541 +16.460000000 16.960000000 69.2957 +17.060000000 17.360000000 246.942 +16.980000000 17.360000000 415.305 +17.400000000 17.620000000 415.305 +17.480000000 17.660000000 207.652 +17.400000000 17.780000000 369.994 +17.640000000 18.100000000 69.2957 +18.160000000 18.320000000 277.183 +18.040000000 18.420000000 415.305 +17.840000000 18.460000000 103.826 +18.120000000 18.540000000 349.228 +18.600000000 18.820000000 415.305 +18.140000000 18.920000000 69.2957 +19.140000000 19.400000000 92.4986 +19.140000000 19.420000000 369.994 +19.140000000 19.480000000 466.164 +19.420000000 19.600000000 92.4986 +19.700000000 19.820000000 92.4986 +19.820000000 20.060000000 369.994 +19.860000000 20.120000000 184.997 +20.000000000 20.220000000 233.082 +20.200000000 20.580000000 369.994 +20.340000000 20.700000000 311.127 +20.760000000 20.900000000 369.994 +20.540000000 21.020000000 123.471 +21.020000000 21.240000000 415.305 +20.980000000 21.300000000 369.994 +21.340000000 21.460000000 155.563 +21.500000000 21.780000000 207.652 +22.120000000 22.300000000 466.164 +22.120000000 22.420000000 554.365 +22.480000000 22.680000000 184.997 +22.020000000 22.760000000 69.2957 +22.840000000 22.980000000 415.305 +22.840000000 23.060000000 493.883 +22.700000000 23.140000000 233.082 +23.600000000 23.760000000 415.305 +23.580000000 23.760000000 493.883 +23.780000000 24.000000000 116.541 +23.460000000 24.360000000 73.4162 +24.380000000 24.500000000 466.164 +24.360000000 24.580000000 415.305 +24.520000000 24.800000000 233.082 +24.960000000 25.620000000 77.7817 +25.220000000 25.700000000 116.541 +25.040000000 25.700000000 369.994 +25.680000000 25.800000000 184.997 +25.780000000 25.940000000 466.164 +25.780000000 26.000000000 932.328 +25.840000000 26.080000000 184.997 +26.180000000 26.420000000 987.767 +26.160000000 26.480000000 493.883 +26.920000000 27.280000000 349.228 +27.200000000 27.320000000 415.305 +27.400000000 27.660000000 246.942 +26.580000000 27.760000000 103.826 +28.080000000 28.380000000 311.127 +28.440000000 28.720000000 184.997 +28.460000000 28.740000000 311.127 +28.780000000 28.900000000 349.228 +28.640000000 29.040000000 233.082 +27.860000000 29.280000000 116.541 +29.180000000 29.520000000 311.127 +29.520000000 29.640000000 277.183 +29.520000000 29.640000000 554.365 +29.680000000 29.840000000 554.365 +29.880000000 30.140000000 554.365 +29.940000000 30.240000000 174.614 +30.180000000 30.460000000 415.305 +30.200000000 30.680000000 207.652 +29.380000000 30.720000000 116.541 +30.720000000 30.840000000 554.365 +30.720000000 30.900000000 277.183 +31.480000000 31.680000000 155.563 +31.480000000 31.700000000 246.942 +31.760000000 31.880000000 184.997 +30.920000000 32.340000000 116.541 +33.060000000 33.200000000 233.082 +33.060000000 33.420000000 415.305 +34.160000000 34.320000000 415.305 +34.520000000 34.800000000 123.471 +34.540000000 34.800000000 207.652 +35.020000000 35.140000000 233.082 +32.500000000 35.240000000 116.541 +35.640000000 35.760000000 184.997 +35.580000000 35.840000000 369.994 +35.960000000 36.080000000 369.994 +35.480000000 36.140000000 116.541 +36.180000000 36.700000000 116.541 +36.740000000 36.880000000 369.994 +36.880000000 37.020000000 184.997 +37.540000000 37.680000000 349.228 +37.620000000 37.860000000 174.614 +37.800000000 37.920000000 233.082 +37.900000000 38.020000000 174.614 +37.940000000 38.060000000 233.082 +37.060000000 38.940000000 116.541 +39.100000000 39.380000000 116.541 +39.080000000 39.380000000 155.563 +39.060000000 39.500000000 311.127 +39.300000000 39.880000000 233.082 +39.400000000 40.040000000 155.563 +39.900000000 40.080000000 233.082 +39.460000000 41.020000000 116.541 +40.720000000 41.140000000 146.832 +40.980000000 41.280000000 233.082 +41.080000000 41.940000000 116.541 +42.100000000 42.220000000 116.541
--- a/testdata/TRIOS-silvet/brahms/violin.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/violin.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,111 +1,69 @@ -3.920000000 4.560000000 1244.51 -4.880000000 5.200000000 1244.51 -3.800000000 5.280000000 622.254 -5.240000000 6.640000000 587.33 -7.200000000 7.400000000 1046.5 -7.520000000 7.640000000 1046.5 -7.160000000 7.840000000 523.251 -7.880000000 8.200000000 1244.51 -7.840000000 8.280000000 622.254 -8.680000000 8.800000000 739.989 -8.880000000 8.960000000 739.989 -8.280000000 9.080000000 698.456 -8.320000000 9.080000000 1396.91 -9.080000000 9.240000000 830.609 -9.360000000 9.480000000 830.609 -9.160000000 9.560000000 1244.51 -9.040000000 9.840000000 415.305 -10.480000000 10.560000000 1567.98 -10.480000000 10.760000000 783.991 -10.240000000 10.960000000 391.995 -11.000000000 11.440000000 1046.5 -11.520000000 11.640000000 1046.5 -11.760000000 11.960000000 1046.5 -10.840000000 12.280000000 523.251 -12.120000000 12.800000000 369.994 -13.120000000 13.240000000 1396.91 -13.240000000 13.320000000 1046.5 -13.080000000 13.400000000 1244.51 -13.200000000 13.480000000 698.456 -12.800000000 13.760000000 349.228 -15.840000000 17.320000000 1108.73 -17.400000000 17.720000000 1479.98 -17.240000000 18.520000000 987.767 -19.040000000 19.840000000 932.328 -19.800000000 20.280000000 1108.73 -20.200000000 21.080000000 1244.51 -21.080000000 21.360000000 830.609 -22.320000000 22.440000000 1479.98 -22.120000000 22.840000000 739.989 -22.840000000 23.200000000 830.609 -23.440000000 23.520000000 1479.98 -23.640000000 23.760000000 698.456 -23.640000000 23.920000000 1396.91 -24.000000000 24.240000000 698.456 -24.040000000 24.240000000 1396.91 -24.520000000 24.640000000 1479.98 -23.200000000 24.720000000 739.989 -25.000000000 25.120000000 739.989 -25.200000000 25.520000000 739.989 -24.840000000 25.600000000 1396.91 -24.800000000 25.640000000 698.456 -25.680000000 26.040000000 1244.51 -25.600000000 26.160000000 622.254 -28.320000000 28.440000000 739.989 -27.760000000 30.160000000 369.994 -30.080000000 30.560000000 349.228 -31.600000000 31.720000000 1244.51 -31.200000000 31.960000000 311.127 -31.960000000 32.200000000 1046.5 -31.880000000 32.280000000 349.228 -32.360000000 32.440000000 622.254 -32.240000000 32.720000000 311.127 -32.640000000 33.440000000 277.183 -33.400000000 33.640000000 622.254 +3.780000000 4.320000000 1244.51 +4.980000000 5.180000000 1244.51 +3.760000000 5.260000000 622.254 +5.240000000 6.480000000 587.33 +7.160000000 7.800000000 523.251 +7.880000000 8.220000000 622.254 +8.280000000 9.040000000 698.456 +8.400000000 9.040000000 1396.91 +9.060000000 9.720000000 415.305 +10.260000000 10.860000000 391.995 +10.860000000 12.160000000 523.251 +12.140000000 12.780000000 369.994 +12.880000000 13.640000000 349.228 +15.920000000 17.280000000 1108.73 +17.220000000 18.380000000 987.767 +19.060000000 19.800000000 932.328 +19.800000000 20.180000000 1108.73 +20.220000000 20.980000000 1244.51 +22.280000000 22.420000000 739.989 +22.580000000 22.780000000 739.989 +22.860000000 23.160000000 830.609 +23.280000000 23.680000000 739.989 +23.680000000 23.880000000 1396.91 +24.040000000 24.200000000 739.989 +24.040000000 24.200000000 1396.91 +24.960000000 25.100000000 1396.91 +25.160000000 25.280000000 739.989 +24.840000000 25.380000000 698.456 +25.340000000 25.560000000 739.989 +25.200000000 25.580000000 1396.91 +25.400000000 25.620000000 698.456 +25.620000000 25.760000000 1244.51 +25.580000000 26.140000000 622.254 +27.760000000 30.100000000 369.994 +30.040000000 30.540000000 349.228 +31.200000000 31.920000000 311.127 +31.960000000 32.120000000 1046.5 +31.880000000 32.260000000 349.228 +32.260000000 32.700000000 311.127 +32.660000000 33.380000000 277.183 33.560000000 33.680000000 1244.51 -33.360000000 33.800000000 311.127 -33.720000000 34.640000000 277.183 -34.560000000 34.680000000 261.626 -34.640000000 34.800000000 493.883 -34.600000000 34.960000000 1244.51 -34.920000000 35.120000000 493.883 -35.040000000 35.280000000 261.626 -35.200000000 35.320000000 493.883 -35.040000000 35.800000000 1244.51 -34.680000000 36.080000000 246.942 -36.160000000 36.280000000 233.082 -36.280000000 36.400000000 246.942 -37.160000000 37.520000000 207.652 -37.680000000 37.800000000 622.254 -37.640000000 37.840000000 207.652 -37.200000000 37.880000000 415.305 -38.000000000 38.160000000 932.328 -37.880000000 38.200000000 233.082 -38.000000000 38.240000000 466.164 -38.360000000 38.560000000 622.254 -38.240000000 38.600000000 415.305 -38.280000000 38.640000000 207.652 -38.760000000 38.880000000 880 -39.200000000 39.360000000 880 -38.520000000 39.440000000 220 -38.600000000 39.520000000 440 -39.600000000 39.720000000 246.942 -39.360000000 39.720000000 466.164 -39.320000000 39.800000000 233.082 -39.560000000 39.800000000 932.328 -39.920000000 40.080000000 440 -40.200000000 40.280000000 440 -39.800000000 40.400000000 466.164 -40.080000000 40.520000000 1108.73 -40.400000000 40.560000000 440 -39.920000000 40.640000000 220 -40.000000000 40.760000000 233.082 -40.760000000 40.880000000 246.942 -40.960000000 41.120000000 233.082 -46.360000000 46.480000000 698.456 -46.400000000 46.520000000 69.2957 -46.360000000 46.560000000 659.255 -46.360000000 46.560000000 1046.5 -46.520000000 46.640000000 523.251 -46.640000000 46.720000000 698.456 -46.640000000 46.720000000 987.767 +33.360000000 33.760000000 311.127 +33.720000000 34.560000000 277.183 +34.620000000 34.740000000 261.626 +34.620000000 34.740000000 1244.51 +34.720000000 35.020000000 246.942 +35.020000000 35.140000000 1244.51 +35.060000000 35.960000000 246.942 +37.280000000 37.420000000 207.652 +37.240000000 37.480000000 415.305 +37.560000000 37.780000000 207.652 +38.000000000 38.220000000 233.082 +38.280000000 38.560000000 415.305 +38.300000000 38.600000000 207.652 +38.560000000 38.780000000 440 +38.740000000 38.860000000 880 +39.120000000 39.320000000 880 +38.800000000 39.340000000 440 +38.640000000 39.420000000 220 +39.360000000 39.480000000 440 +39.480000000 39.620000000 466.164 +39.580000000 39.700000000 932.328 +39.640000000 39.760000000 466.164 +39.320000000 40.000000000 233.082 +40.100000000 40.220000000 233.082 +40.180000000 40.380000000 220 +40.260000000 40.380000000 466.164 +40.340000000 40.480000000 440 +40.360000000 40.640000000 233.082
--- a/testdata/TRIOS-silvet/brahms/violin_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/brahms/violin_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,178 +1,84 @@ -4.000000000 4.200000000 1244.51 -4.480000000 4.600000000 1244.51 -4.840000000 5.160000000 1244.51 -3.800000000 5.280000000 622.254 -5.640000000 5.840000000 1174.66 -6.280000000 6.400000000 1174.66 -6.480000000 6.760000000 1174.66 +3.780000000 4.240000000 1244.51 +4.280000000 4.400000000 1244.51 +4.480000000 4.880000000 1244.51 +5.040000000 5.160000000 1244.51 +3.760000000 5.260000000 622.254 +5.600000000 5.720000000 1174.66 +6.580000000 6.720000000 1174.66 5.240000000 6.880000000 587.33 -7.320000000 7.440000000 1046.5 -7.520000000 7.640000000 1046.5 -7.720000000 7.880000000 1046.5 7.080000000 7.920000000 523.251 -8.080000000 8.280000000 1244.51 -7.880000000 8.320000000 622.254 -8.280000000 9.120000000 698.456 -9.040000000 9.120000000 1396.91 -9.400000000 9.480000000 830.609 -9.720000000 9.800000000 830.609 -9.000000000 10.080000000 415.305 -10.200000000 10.720000000 783.991 -10.840000000 11.000000000 783.991 -10.200000000 11.040000000 391.995 -11.040000000 11.240000000 1046.5 -11.360000000 11.640000000 1046.5 -11.760000000 11.960000000 1046.5 -12.120000000 12.280000000 1046.5 -10.880000000 12.320000000 523.251 -12.080000000 12.960000000 369.994 -13.200000000 13.280000000 698.456 -13.160000000 13.320000000 1046.5 -13.120000000 13.320000000 1244.51 -13.400000000 13.480000000 1244.51 -13.440000000 13.520000000 1046.5 -13.600000000 13.720000000 698.456 -13.600000000 13.800000000 1244.51 -13.600000000 13.840000000 1046.5 -12.800000000 14.000000000 349.228 -15.840000000 17.360000000 1108.73 -17.240000000 18.840000000 987.767 -19.040000000 19.920000000 932.328 -19.800000000 20.280000000 1108.73 -20.200000000 21.080000000 1244.51 -21.320000000 21.560000000 1661.22 -21.000000000 21.600000000 830.609 -22.120000000 22.840000000 1479.98 -22.120000000 22.920000000 739.989 -22.840000000 23.240000000 830.609 -23.200000000 23.360000000 1479.98 -23.400000000 23.600000000 1479.98 -23.200000000 23.680000000 739.989 -23.640000000 23.760000000 1396.91 -23.960000000 24.120000000 1396.91 -23.600000000 24.400000000 698.456 -24.520000000 24.600000000 1108.73 -24.360000000 24.800000000 739.989 -24.360000000 24.800000000 1479.98 -24.920000000 25.000000000 1760 -24.800000000 25.200000000 1396.91 -25.280000000 25.520000000 1396.91 -24.760000000 25.680000000 698.456 -25.680000000 26.000000000 1244.51 -26.120000000 26.400000000 1244.51 -25.560000000 26.440000000 622.254 -27.760000000 27.920000000 1479.98 -27.800000000 27.960000000 739.989 -28.280000000 28.400000000 739.989 -28.680000000 28.760000000 1244.51 -28.680000000 28.800000000 739.989 -28.920000000 29.000000000 739.989 -29.240000000 29.320000000 739.989 -29.240000000 29.320000000 1479.98 -29.400000000 29.480000000 1479.98 -29.640000000 29.720000000 739.989 -29.640000000 29.720000000 1244.51 -29.600000000 29.840000000 1479.98 -29.920000000 30.120000000 1479.98 -27.720000000 30.160000000 369.994 -29.960000000 30.160000000 1244.51 -30.280000000 30.480000000 1046.5 -30.600000000 30.720000000 1046.5 -30.280000000 30.720000000 1244.51 -30.600000000 30.720000000 1396.91 -30.080000000 30.800000000 349.228 -31.360000000 31.480000000 622.254 -31.400000000 31.520000000 932.328 -31.840000000 31.920000000 932.328 -31.600000000 31.960000000 622.254 -31.160000000 32.000000000 311.127 -32.040000000 32.160000000 1046.5 -31.920000000 32.320000000 349.228 -32.600000000 32.720000000 622.254 -32.440000000 32.720000000 932.328 -32.240000000 32.800000000 311.127 -32.880000000 32.960000000 830.609 -33.280000000 33.360000000 830.609 -32.680000000 33.440000000 987.767 -32.640000000 33.480000000 277.183 -33.600000000 33.680000000 932.328 -33.400000000 33.840000000 622.254 -33.760000000 33.840000000 932.328 -33.320000000 33.920000000 311.127 -33.960000000 34.040000000 830.609 -33.800000000 34.400000000 987.767 -34.120000000 34.480000000 830.609 -33.720000000 34.640000000 277.183 -34.840000000 34.920000000 739.989 -34.800000000 34.960000000 1244.51 -35.200000000 35.400000000 1244.51 -34.480000000 35.480000000 493.883 -35.080000000 35.600000000 987.767 -35.560000000 35.680000000 739.989 -35.680000000 35.760000000 987.767 -35.520000000 35.800000000 1244.51 -35.920000000 36.000000000 1244.51 -34.520000000 36.040000000 246.942 -35.600000000 36.040000000 493.883 -36.040000000 36.120000000 466.164 -36.120000000 36.360000000 233.082 -36.240000000 36.560000000 466.164 -36.640000000 36.720000000 932.328 -36.400000000 36.760000000 233.082 -36.640000000 36.760000000 698.456 -36.600000000 36.760000000 1661.22 -36.680000000 36.800000000 466.164 -37.160000000 37.280000000 207.652 -37.280000000 37.400000000 622.254 -37.320000000 37.400000000 1046.5 -37.480000000 37.560000000 1046.5 -37.360000000 37.600000000 207.652 -37.480000000 37.640000000 415.305 -37.640000000 37.880000000 207.652 -37.800000000 37.920000000 415.305 -37.800000000 37.920000000 622.254 -38.040000000 38.280000000 698.456 -37.960000000 38.320000000 233.082 -37.880000000 38.320000000 466.164 -38.320000000 38.440000000 207.652 -38.400000000 38.600000000 1479.98 -38.320000000 38.640000000 415.305 -38.320000000 38.640000000 622.254 -38.320000000 38.680000000 1046.5 -38.560000000 38.720000000 207.652 -38.640000000 38.840000000 440 -38.760000000 38.880000000 880 -38.680000000 38.960000000 659.255 -38.640000000 38.960000000 1108.73 -39.200000000 39.320000000 659.255 -39.080000000 39.320000000 1108.73 -38.880000000 39.400000000 440 -39.200000000 39.400000000 880 -38.600000000 39.440000000 220 -39.480000000 39.640000000 1174.66 -39.520000000 39.840000000 698.456 -39.400000000 39.880000000 233.082 -39.360000000 39.880000000 466.164 -39.720000000 39.880000000 1174.66 -39.840000000 40.080000000 440 -40.000000000 40.120000000 880 -40.000000000 40.320000000 1108.73 -40.240000000 40.520000000 880 -40.440000000 40.600000000 659.255 -40.120000000 40.680000000 440 -39.880000000 40.720000000 220 -40.720000000 40.840000000 698.456 -40.760000000 40.920000000 1174.66 -40.880000000 41.000000000 698.456 -40.960000000 41.120000000 1174.66 -41.080000000 41.160000000 698.456 -40.960000000 41.160000000 932.328 -41.280000000 41.360000000 1661.22 -40.600000000 41.520000000 466.164 -41.320000000 41.520000000 1174.66 -41.240000000 41.600000000 698.456 -41.400000000 41.600000000 932.328 -41.600000000 41.760000000 466.164 -41.680000000 41.760000000 698.456 -41.640000000 41.760000000 1174.66 -40.640000000 41.840000000 233.082 +7.900000000 8.300000000 622.254 +8.280000000 8.500000000 698.456 +8.520000000 9.120000000 698.456 +9.000000000 10.040000000 415.305 +10.260000000 10.380000000 783.991 +10.200000000 10.980000000 391.995 +10.880000000 11.040000000 1046.5 +11.280000000 11.400000000 1046.5 +11.540000000 11.680000000 1046.5 +12.020000000 12.180000000 1046.5 +10.860000000 12.260000000 523.251 +12.100000000 12.900000000 369.994 +12.820000000 13.940000000 349.228 +15.840000000 17.300000000 1108.73 +17.220000000 18.820000000 987.767 +19.020000000 19.860000000 932.328 +19.800000000 20.240000000 1108.73 +20.220000000 21.040000000 1244.51 +21.000000000 21.120000000 830.609 +21.180000000 21.560000000 830.609 +22.100000000 22.840000000 739.989 +22.840000000 23.220000000 830.609 +23.220000000 23.460000000 1479.98 +23.200000000 23.640000000 739.989 +23.620000000 24.380000000 698.456 +24.380000000 24.780000000 739.989 +24.900000000 25.020000000 1396.91 +25.280000000 25.500000000 1396.91 +24.780000000 25.660000000 698.456 +25.580000000 26.400000000 622.254 +27.720000000 30.140000000 369.994 +30.080000000 30.760000000 349.228 +31.220000000 31.580000000 311.127 +31.620000000 31.940000000 311.127 +31.940000000 32.280000000 349.228 +32.300000000 32.760000000 311.127 +32.660000000 33.440000000 277.183 +33.360000000 33.880000000 311.127 +33.720000000 34.600000000 277.183 +34.520000000 35.240000000 493.883 +34.520000000 35.280000000 246.942 +35.280000000 35.560000000 493.883 +35.640000000 35.800000000 493.883 +35.820000000 35.980000000 493.883 +35.480000000 36.020000000 246.942 +36.460000000 36.680000000 233.082 +36.600000000 36.720000000 466.164 +37.200000000 37.400000000 207.652 +37.420000000 37.820000000 207.652 +38.080000000 38.220000000 233.082 +37.880000000 38.280000000 466.164 +38.340000000 38.600000000 622.254 +38.440000000 38.600000000 1046.5 +38.340000000 38.660000000 207.652 +38.620000000 39.220000000 440 +39.160000000 39.280000000 880 +38.660000000 39.400000000 220 +39.360000000 39.520000000 466.164 +39.440000000 39.560000000 233.082 +39.540000000 39.820000000 466.164 +39.600000000 39.880000000 233.082 +39.860000000 40.040000000 220 +39.900000000 40.120000000 440 +40.060000000 40.180000000 220 +40.240000000 40.440000000 440 +40.220000000 40.560000000 220 +40.500000000 40.620000000 440 +40.600000000 40.720000000 466.164 +40.700000000 40.900000000 233.082 +40.840000000 41.040000000 466.164 +41.100000000 41.280000000 466.164 +41.220000000 41.340000000 698.456 +40.940000000 41.600000000 233.082 +41.460000000 41.720000000 466.164 +41.640000000 41.760000000 233.082
--- a/testdata/TRIOS-silvet/lussier/bassoon.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/bassoon.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,169 +1,73 @@ -1.120000000 1.240000000 220 -1.080000000 1.320000000 110 -1.360000000 1.520000000 261.626 -1.360000000 1.560000000 523.251 -1.680000000 1.840000000 261.626 -1.640000000 1.840000000 523.251 -1.920000000 2.080000000 391.995 -1.920000000 2.080000000 523.251 -2.200000000 2.320000000 246.942 -2.280000000 2.360000000 261.626 -2.160000000 2.400000000 493.883 -2.480000000 2.600000000 493.883 -2.400000000 2.680000000 246.942 -2.760000000 2.840000000 246.942 -2.800000000 2.880000000 659.255 -2.760000000 2.920000000 164.814 -2.760000000 2.960000000 493.883 -3.000000000 3.240000000 246.942 -3.320000000 3.400000000 440 -3.320000000 3.400000000 622.254 -3.320000000 3.440000000 174.614 -3.280000000 3.480000000 261.626 -3.280000000 3.480000000 523.251 +1.080000000 1.200000000 440 +1.100000000 1.220000000 659.255 +1.040000000 1.280000000 110 +1.360000000 1.540000000 523.251 +1.380000000 1.560000000 261.626 +1.360000000 1.580000000 277.183 +1.660000000 1.800000000 261.626 +1.620000000 1.800000000 523.251 +1.920000000 2.060000000 523.251 +2.180000000 2.360000000 246.942 +2.440000000 2.680000000 246.942 +2.740000000 2.940000000 164.814 +3.020000000 3.140000000 493.883 +3.000000000 3.200000000 246.942 +3.300000000 3.420000000 174.614 +3.300000000 3.420000000 261.626 +3.280000000 3.440000000 523.251 +3.580000000 3.700000000 261.626 3.560000000 3.720000000 523.251 -3.560000000 3.760000000 261.626 -3.840000000 3.960000000 261.626 -3.840000000 4.000000000 523.251 -4.120000000 4.240000000 391.995 -4.120000000 4.240000000 523.251 -4.400000000 4.520000000 493.883 -4.720000000 4.800000000 261.626 -4.360000000 4.840000000 246.942 -4.640000000 4.840000000 493.883 -4.920000000 5.000000000 698.456 -4.920000000 5.120000000 523.251 -5.200000000 5.320000000 233.082 -5.200000000 5.320000000 659.255 -5.200000000 5.360000000 440 -5.160000000 5.400000000 220 -5.440000000 5.640000000 293.665 -5.400000000 5.680000000 146.832 -5.400000000 5.680000000 155.563 -5.720000000 5.880000000 261.626 -6.000000000 6.120000000 261.626 -5.720000000 6.160000000 523.251 -6.280000000 6.400000000 659.255 -6.320000000 6.440000000 233.082 -6.240000000 6.480000000 220 -6.520000000 6.720000000 523.251 -6.520000000 6.960000000 261.626 -6.800000000 7.000000000 523.251 -7.120000000 7.200000000 698.456 -7.080000000 7.240000000 174.614 -7.080000000 7.240000000 523.251 -7.360000000 7.520000000 261.626 -7.320000000 7.520000000 523.251 -7.640000000 7.760000000 293.665 -7.600000000 7.800000000 146.832 -7.600000000 7.840000000 155.563 -7.880000000 8.080000000 261.626 -7.880000000 8.080000000 523.251 -8.280000000 8.440000000 739.989 -8.200000000 8.520000000 493.883 -8.160000000 8.560000000 246.942 -8.400000000 8.840000000 293.665 -8.720000000 9.080000000 523.251 -8.760000000 9.120000000 261.626 -9.040000000 9.280000000 739.989 -9.000000000 9.320000000 493.883 -9.000000000 9.400000000 246.942 -9.240000000 9.400000000 466.164 -9.280000000 9.520000000 698.456 -9.240000000 9.640000000 233.082 -9.640000000 9.720000000 659.255 -9.600000000 9.760000000 440 -9.480000000 9.800000000 220 -9.840000000 9.960000000 103.826 -9.800000000 10.000000000 523.251 -10.560000000 10.680000000 123.471 -10.040000000 10.720000000 246.942 -10.640000000 10.760000000 493.883 -10.920000000 11.040000000 293.665 -11.240000000 11.320000000 261.626 -11.160000000 11.320000000 493.883 -11.120000000 11.440000000 246.942 -11.440000000 11.520000000 659.255 -11.480000000 11.600000000 493.883 -11.400000000 11.640000000 164.814 -11.640000000 11.920000000 246.942 -11.920000000 12.080000000 311.127 -12.000000000 12.160000000 103.826 -11.920000000 12.200000000 523.251 -12.240000000 12.440000000 493.883 -12.520000000 12.640000000 493.883 -12.800000000 12.880000000 493.883 -12.800000000 12.920000000 123.471 -12.840000000 12.920000000 369.994 -12.200000000 12.960000000 246.942 -13.080000000 13.160000000 622.254 -13.160000000 13.240000000 220 -13.040000000 13.280000000 207.652 -13.320000000 13.560000000 246.942 -13.600000000 13.680000000 155.563 -13.600000000 13.720000000 659.255 -13.440000000 13.800000000 493.883 -13.560000000 13.880000000 164.814 -13.880000000 14.000000000 329.628 -13.880000000 14.040000000 155.563 -13.880000000 14.080000000 493.883 -13.880000000 14.080000000 659.255 -13.960000000 14.200000000 164.814 -14.160000000 14.240000000 493.883 -14.160000000 14.280000000 523.251 -14.160000000 14.320000000 349.228 -14.120000000 14.320000000 698.456 -14.280000000 14.400000000 329.628 -14.280000000 14.440000000 311.127 -14.200000000 14.440000000 659.255 -14.440000000 14.520000000 493.883 -14.440000000 14.520000000 739.989 -14.520000000 14.600000000 415.305 -14.400000000 14.640000000 246.942 -14.520000000 14.640000000 622.254 -14.560000000 14.680000000 207.652 -14.640000000 14.720000000 220 -14.680000000 14.840000000 155.563 -14.680000000 14.880000000 164.814 -14.760000000 14.880000000 523.251 -14.720000000 14.880000000 659.255 -14.920000000 15.000000000 493.883 -14.800000000 15.040000000 246.942 -14.960000000 15.040000000 622.254 -14.960000000 15.080000000 415.305 -15.120000000 15.200000000 698.456 -14.960000000 15.240000000 523.251 -15.120000000 15.280000000 174.614 -15.240000000 15.360000000 739.989 -15.360000000 15.440000000 207.652 -15.400000000 15.520000000 220 -15.240000000 15.560000000 246.942 -15.520000000 15.600000000 698.456 -15.520000000 15.600000000 880 -15.520000000 15.720000000 174.614 -15.640000000 15.720000000 659.255 -15.760000000 15.880000000 698.456 -15.760000000 15.960000000 174.614 -15.360000000 15.960000000 523.251 -15.880000000 16.000000000 659.255 -15.560000000 16.120000000 164.814 -16.040000000 16.120000000 587.33 -16.040000000 16.160000000 369.994 -15.640000000 16.160000000 493.883 -16.000000000 16.200000000 246.942 -16.160000000 16.280000000 311.127 -16.160000000 16.320000000 103.826 -16.160000000 16.360000000 523.251 -16.320000000 16.400000000 554.365 -16.360000000 16.440000000 1244.51 -16.320000000 16.480000000 220 -16.320000000 16.600000000 110 -16.480000000 16.600000000 554.365 -17.600000000 17.680000000 659.255 -17.800000000 17.880000000 1244.51 -17.800000000 17.920000000 523.251 -18.000000000 18.080000000 466.164 -18.000000000 18.080000000 493.883 -18.000000000 18.080000000 523.251 -17.960000000 18.080000000 659.255 -17.960000000 18.080000000 1567.98 +3.840000000 3.960000000 523.251 +4.340000000 4.480000000 246.942 +4.360000000 4.500000000 493.883 +4.620000000 4.800000000 246.942 +4.920000000 5.040000000 523.251 +5.160000000 5.320000000 220 +5.480000000 5.600000000 293.665 +5.740000000 5.900000000 523.251 +5.980000000 6.140000000 523.251 +6.260000000 6.400000000 220 +6.520000000 6.700000000 523.251 +6.800000000 6.960000000 523.251 +7.080000000 7.220000000 523.251 +7.340000000 7.480000000 523.251 +7.620000000 7.740000000 146.832 +7.900000000 8.020000000 261.626 +7.880000000 8.060000000 523.251 +8.180000000 8.480000000 246.942 +8.340000000 8.480000000 493.883 +8.420000000 8.760000000 293.665 +8.740000000 9.040000000 523.251 +8.780000000 9.100000000 261.626 +9.020000000 9.280000000 493.883 +9.000000000 9.320000000 246.942 +9.240000000 9.380000000 233.082 +9.440000000 9.560000000 233.082 +9.520000000 9.740000000 220 +10.060000000 10.180000000 246.942 +10.340000000 10.480000000 246.942 +11.140000000 11.300000000 246.942 +11.440000000 11.560000000 164.814 +11.680000000 11.880000000 246.942 +12.000000000 12.120000000 103.826 +11.960000000 12.120000000 523.251 +12.220000000 12.380000000 246.942 +12.500000000 12.620000000 246.942 +13.320000000 13.520000000 246.942 +13.600000000 13.780000000 164.814 +13.900000000 14.020000000 493.883 +14.140000000 14.280000000 698.456 +14.240000000 14.360000000 329.628 +14.240000000 14.360000000 659.255 +14.420000000 14.540000000 246.942 +14.820000000 14.980000000 493.883 +14.980000000 15.240000000 523.251 +15.240000000 15.360000000 493.883 +15.220000000 15.420000000 246.942 +15.500000000 15.640000000 523.251 +15.640000000 15.760000000 164.814 +15.760000000 15.920000000 523.251 +15.880000000 16.000000000 329.628 +15.880000000 16.000000000 493.883 +16.160000000 16.320000000 523.251 +16.320000000 16.520000000 110
--- a/testdata/TRIOS-silvet/lussier/bassoon_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/bassoon_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,119 +1,77 @@ -1.080000000 1.320000000 110 -1.400000000 1.560000000 523.251 -1.640000000 1.760000000 523.251 -1.320000000 1.920000000 261.626 -2.040000000 2.120000000 261.626 -1.920000000 2.160000000 391.995 -1.920000000 2.240000000 130.813 -2.320000000 2.400000000 493.883 -2.200000000 2.720000000 246.942 -2.840000000 2.920000000 493.883 -2.760000000 2.960000000 329.628 -2.760000000 3.000000000 164.814 -3.000000000 3.280000000 246.942 -3.400000000 3.480000000 349.228 -3.360000000 3.480000000 440 -3.320000000 3.520000000 174.614 -3.440000000 3.560000000 87.3071 -3.320000000 3.720000000 523.251 -3.840000000 3.960000000 523.251 -3.520000000 4.120000000 261.626 -4.120000000 4.320000000 391.995 -4.080000000 4.400000000 130.813 -4.360000000 4.920000000 246.942 -4.880000000 5.120000000 174.614 -5.080000000 5.160000000 349.228 -4.920000000 5.160000000 523.251 -5.200000000 5.280000000 329.628 -5.240000000 5.360000000 440 -5.160000000 5.480000000 220 -5.480000000 5.680000000 293.665 -5.440000000 5.720000000 146.832 -5.720000000 5.880000000 523.251 -6.000000000 6.160000000 523.251 -5.680000000 6.280000000 261.626 -6.320000000 6.400000000 440 -6.280000000 6.480000000 220 -6.520000000 6.680000000 523.251 -6.480000000 7.040000000 261.626 -6.840000000 7.040000000 523.251 -7.040000000 7.320000000 174.614 -7.120000000 7.480000000 523.251 -7.280000000 7.640000000 261.626 -7.640000000 7.840000000 146.832 -7.680000000 7.840000000 293.665 -7.880000000 8.120000000 523.251 -7.840000000 8.200000000 261.626 -8.200000000 8.640000000 246.942 -8.480000000 8.800000000 587.33 -8.400000000 8.880000000 293.665 -8.840000000 9.080000000 523.251 -8.720000000 9.120000000 261.626 -9.000000000 9.400000000 246.942 -9.280000000 9.640000000 233.082 -9.520000000 9.880000000 220 -9.840000000 10.000000000 103.826 -9.840000000 10.040000000 523.251 -10.480000000 10.560000000 493.883 -10.040000000 10.640000000 246.942 -10.560000000 10.840000000 123.471 -10.680000000 10.840000000 246.942 -10.920000000 11.160000000 587.33 -10.840000000 11.200000000 293.665 -11.200000000 11.360000000 493.883 -11.160000000 11.440000000 246.942 -11.480000000 11.600000000 329.628 -11.520000000 11.600000000 493.883 -11.400000000 11.680000000 164.814 -11.640000000 11.960000000 246.942 -12.000000000 12.160000000 103.826 -12.000000000 12.240000000 523.251 -12.200000000 12.800000000 246.942 -12.800000000 13.080000000 123.471 -13.080000000 13.320000000 207.652 -13.120000000 13.320000000 622.254 -13.320000000 13.640000000 246.942 -13.600000000 13.880000000 164.814 -13.880000000 14.160000000 659.255 -13.680000000 14.240000000 329.628 -14.120000000 14.360000000 698.456 -14.120000000 14.400000000 349.228 -14.280000000 14.480000000 329.628 -14.280000000 14.520000000 659.255 -14.600000000 14.680000000 207.652 -14.400000000 14.680000000 246.942 -14.560000000 14.720000000 415.305 -14.560000000 14.760000000 622.254 -14.680000000 14.960000000 329.628 -14.680000000 14.960000000 659.255 -14.840000000 15.040000000 246.942 -15.120000000 15.320000000 523.251 -15.080000000 15.360000000 174.614 -15.240000000 15.480000000 246.942 -15.400000000 15.520000000 622.254 -15.440000000 15.560000000 207.652 -15.640000000 15.800000000 329.628 -15.680000000 15.840000000 493.883 -15.520000000 15.960000000 174.614 -15.520000000 16.000000000 523.251 -15.920000000 16.040000000 493.883 -15.880000000 16.080000000 329.628 -15.600000000 16.200000000 164.814 -16.040000000 16.240000000 123.471 -16.240000000 16.320000000 103.826 -16.200000000 16.320000000 311.127 -16.200000000 16.400000000 523.251 -16.600000000 16.680000000 329.628 -16.560000000 16.680000000 440 -16.320000000 16.680000000 554.365 -16.360000000 16.720000000 220 -16.280000000 16.760000000 110 -17.600000000 17.680000000 277.183 -17.720000000 17.920000000 659.255 -17.840000000 18.000000000 554.365 -17.840000000 18.000000000 1108.73 -17.880000000 18.080000000 1244.51 -17.880000000 18.080000000 1661.22 -18.040000000 18.160000000 349.228 -18.080000000 18.160000000 466.164 -18.080000000 18.160000000 587.33 +1.100000000 1.220000000 329.628 +1.080000000 1.280000000 554.365 +1.000000000 1.340000000 110 +1.300000000 1.440000000 277.183 +1.360000000 1.480000000 246.942 +1.360000000 1.540000000 523.251 +1.560000000 1.840000000 523.251 +1.320000000 1.880000000 261.626 +1.940000000 2.140000000 391.995 +2.020000000 2.140000000 523.251 +1.920000000 2.200000000 130.813 +2.200000000 2.700000000 246.942 +2.740000000 2.980000000 164.814 +3.000000000 3.260000000 246.942 +3.320000000 3.440000000 440 +3.320000000 3.460000000 87.3071 +3.300000000 3.480000000 174.614 +3.340000000 3.520000000 523.251 +3.560000000 3.780000000 523.251 +3.820000000 3.960000000 523.251 +3.520000000 4.060000000 261.626 +4.160000000 4.280000000 391.995 +4.100000000 4.340000000 130.813 +4.360000000 4.880000000 246.942 +4.920000000 5.140000000 174.614 +4.940000000 5.140000000 523.251 +5.200000000 5.440000000 220 +5.500000000 5.620000000 293.665 +5.540000000 5.660000000 146.832 +5.720000000 5.900000000 523.251 +5.700000000 6.220000000 261.626 +6.280000000 6.460000000 220 +6.560000000 6.680000000 523.251 +6.540000000 7.020000000 261.626 +7.100000000 7.300000000 523.251 +7.080000000 7.320000000 174.614 +7.340000000 7.460000000 523.251 +7.340000000 7.580000000 261.626 +7.660000000 7.820000000 146.832 +7.900000000 8.040000000 523.251 +7.880000000 8.160000000 261.626 +8.200000000 8.600000000 246.942 +8.560000000 8.740000000 587.33 +8.420000000 8.840000000 293.665 +8.780000000 9.040000000 261.626 +8.820000000 9.060000000 523.251 +9.080000000 9.340000000 246.942 +9.320000000 9.580000000 233.082 +9.680000000 9.840000000 220 +10.140000000 10.280000000 246.942 +10.360000000 10.580000000 246.942 +10.640000000 10.760000000 123.471 +10.980000000 11.100000000 587.33 +10.860000000 11.140000000 293.665 +11.180000000 11.380000000 246.942 +11.760000000 11.900000000 246.942 +12.300000000 12.480000000 246.942 +12.580000000 12.820000000 246.942 +13.360000000 13.580000000 246.942 +13.640000000 13.820000000 164.814 +13.880000000 14.120000000 659.255 +13.900000000 14.140000000 329.628 +14.120000000 14.340000000 349.228 +14.300000000 14.420000000 329.628 +14.280000000 14.440000000 659.255 +14.480000000 14.620000000 246.942 +14.700000000 14.900000000 329.628 +14.720000000 14.900000000 659.255 +15.140000000 15.280000000 174.614 +15.140000000 15.300000000 523.251 +15.280000000 15.440000000 246.942 +15.520000000 15.680000000 523.251 +15.660000000 15.780000000 329.628 +15.800000000 15.920000000 174.614 +15.900000000 16.020000000 329.628 +15.940000000 16.060000000 164.814 +16.340000000 16.700000000 110
--- a/testdata/TRIOS-silvet/lussier/mix.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/mix.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,211 +1,91 @@ -1.040000000 1.120000000 622.254 -1.120000000 1.320000000 110 -1.160000000 1.320000000 493.883 -1.360000000 1.520000000 523.251 -1.040000000 1.520000000 659.255 -1.680000000 1.760000000 261.626 -1.640000000 1.800000000 523.251 -1.520000000 1.960000000 493.883 -1.920000000 2.080000000 523.251 +1.080000000 1.200000000 1479.98 +1.100000000 1.340000000 493.883 +1.100000000 1.400000000 110 +1.040000000 1.620000000 659.255 +1.500000000 1.800000000 523.251 +1.420000000 1.960000000 493.883 +1.880000000 2.060000000 523.251 1.880000000 2.120000000 698.456 -2.000000000 2.240000000 440 1.920000000 2.320000000 220 -2.200000000 2.320000000 246.942 -2.240000000 2.360000000 493.883 -2.160000000 2.480000000 466.164 -2.480000000 2.560000000 493.883 -2.280000000 2.600000000 440 -2.440000000 2.640000000 246.942 -2.560000000 2.680000000 466.164 -2.800000000 2.880000000 493.883 -2.880000000 3.080000000 391.995 -3.000000000 3.200000000 246.942 -2.760000000 3.240000000 659.255 -3.200000000 3.280000000 783.991 -3.160000000 3.320000000 391.995 -3.320000000 3.400000000 261.626 -3.320000000 3.400000000 698.456 -3.200000000 4.000000000 87.3071 -4.120000000 4.240000000 391.995 -3.320000000 4.240000000 523.251 -4.200000000 4.280000000 1479.98 -4.160000000 4.320000000 587.33 -4.160000000 4.400000000 880 -4.360000000 4.520000000 246.942 -4.600000000 4.760000000 246.942 -4.240000000 4.880000000 493.883 -4.880000000 5.080000000 523.251 -4.960000000 5.080000000 659.255 -5.240000000 5.320000000 659.255 -5.000000000 5.400000000 440 -5.320000000 5.480000000 466.164 -4.960000000 5.560000000 220 -5.440000000 5.560000000 293.665 -5.560000000 5.640000000 440 -5.520000000 5.680000000 146.832 -5.520000000 5.760000000 880 -5.720000000 5.920000000 523.251 +2.180000000 2.320000000 466.164 +2.240000000 2.360000000 440 +2.460000000 2.580000000 246.942 +2.440000000 2.640000000 440 +2.740000000 2.860000000 164.814 +2.740000000 3.020000000 659.255 +3.020000000 3.140000000 246.942 +3.020000000 3.140000000 493.883 +2.900000000 3.300000000 391.995 +3.320000000 3.440000000 698.456 +3.260000000 3.940000000 87.3071 +3.300000000 4.180000000 523.251 +4.140000000 4.340000000 880 +4.380000000 4.500000000 246.942 +4.620000000 4.740000000 246.942 +4.220000000 4.920000000 493.883 +4.920000000 5.040000000 523.251 +5.020000000 5.380000000 220 +5.400000000 5.520000000 220 +5.520000000 5.700000000 880 +5.740000000 5.880000000 523.251 5.800000000 5.920000000 587.33 -5.960000000 6.160000000 698.456 -6.000000000 6.240000000 523.251 -6.280000000 6.360000000 220 -6.480000000 6.560000000 1174.66 -5.520000000 6.600000000 659.255 -6.560000000 6.640000000 261.626 -6.520000000 6.720000000 523.251 -6.640000000 6.840000000 1174.66 -6.840000000 6.920000000 261.626 -6.800000000 6.960000000 523.251 -6.360000000 7.080000000 587.33 -7.120000000 7.240000000 698.456 -7.120000000 7.400000000 659.255 -7.360000000 7.440000000 1567.98 -7.080000000 7.560000000 523.251 -7.680000000 7.760000000 293.665 -7.720000000 7.840000000 1567.98 -7.680000000 7.920000000 146.832 -7.760000000 8.080000000 1046.5 -7.680000000 8.200000000 130.813 -8.120000000 8.240000000 1046.5 -8.200000000 8.360000000 493.883 -8.200000000 8.480000000 246.942 -8.400000000 8.560000000 493.883 -7.600000000 8.560000000 523.251 -8.520000000 8.640000000 698.456 -8.400000000 8.800000000 293.665 -8.760000000 9.080000000 261.626 -8.720000000 9.080000000 523.251 -9.000000000 9.240000000 246.942 -8.600000000 9.320000000 493.883 -9.280000000 9.400000000 466.164 -9.320000000 9.440000000 587.33 -9.360000000 9.480000000 523.251 -9.360000000 9.560000000 233.082 -9.600000000 9.720000000 440 -9.480000000 9.760000000 220 -9.800000000 9.920000000 523.251 -9.880000000 9.960000000 246.942 -10.000000000 10.120000000 587.33 -10.080000000 10.200000000 246.942 -10.040000000 10.240000000 659.255 -10.360000000 10.480000000 246.942 -10.120000000 10.560000000 329.628 -10.240000000 10.600000000 830.609 -10.520000000 10.640000000 587.33 -10.640000000 10.720000000 622.254 -10.640000000 10.760000000 493.883 -10.320000000 10.880000000 659.255 -10.600000000 10.920000000 103.826 -10.800000000 11.120000000 830.609 -11.080000000 11.160000000 587.33 -10.880000000 11.160000000 1479.98 -11.120000000 11.200000000 246.942 -10.960000000 11.360000000 103.826 -11.000000000 11.400000000 493.883 -11.200000000 11.440000000 659.255 -11.400000000 11.520000000 164.814 -11.480000000 11.560000000 493.883 -11.480000000 11.600000000 329.628 -11.320000000 11.600000000 830.609 -11.400000000 11.760000000 82.4069 -11.720000000 11.840000000 1174.66 -11.520000000 11.880000000 587.33 -11.800000000 11.920000000 82.4069 -11.720000000 11.960000000 659.255 -11.640000000 12.000000000 164.814 -11.880000000 12.080000000 830.609 -11.960000000 12.120000000 523.251 -12.160000000 12.240000000 587.33 -12.160000000 12.280000000 174.614 -12.240000000 12.360000000 493.883 -12.240000000 12.400000000 246.942 -12.320000000 12.400000000 698.456 -11.960000000 12.560000000 349.228 -12.560000000 12.640000000 174.614 -11.840000000 12.680000000 87.3071 -12.440000000 12.680000000 1760 -12.520000000 12.720000000 246.942 -12.440000000 12.760000000 830.609 -12.680000000 12.800000000 349.228 -12.680000000 12.840000000 587.33 -12.760000000 12.880000000 493.883 -12.640000000 12.880000000 698.456 -12.800000000 13.120000000 293.665 -13.000000000 13.160000000 1760 -12.800000000 13.240000000 146.832 -13.160000000 13.240000000 220 -13.080000000 13.240000000 1174.66 -12.960000000 13.320000000 830.609 -13.280000000 13.400000000 1760 -13.360000000 13.440000000 293.665 -13.320000000 13.520000000 246.942 -13.400000000 13.560000000 146.832 -13.120000000 13.560000000 587.33 -13.400000000 13.600000000 1174.66 -13.600000000 13.720000000 246.942 -13.680000000 13.760000000 493.883 -13.720000000 13.800000000 1661.22 -13.560000000 13.880000000 164.814 -13.760000000 13.880000000 587.33 -13.880000000 13.960000000 493.883 -13.880000000 14.000000000 1661.22 -13.520000000 14.120000000 82.4069 -13.960000000 14.280000000 164.814 -14.120000000 14.280000000 698.456 -14.160000000 14.320000000 349.228 -14.320000000 14.440000000 311.127 -14.360000000 14.440000000 587.33 -14.440000000 14.520000000 493.883 -14.280000000 14.520000000 659.255 -14.440000000 14.560000000 246.942 -13.440000000 14.560000000 830.609 -14.520000000 14.600000000 587.33 -14.560000000 14.640000000 622.254 -14.560000000 14.680000000 329.628 -14.520000000 14.720000000 174.614 -14.680000000 14.840000000 164.814 -14.720000000 14.880000000 659.255 -14.840000000 14.920000000 246.942 -14.640000000 14.920000000 587.33 -14.920000000 15.000000000 164.814 -14.600000000 15.120000000 82.4069 -14.920000000 15.160000000 146.832 -15.120000000 15.240000000 174.614 -14.960000000 15.240000000 523.251 -14.040000000 15.280000000 87.3071 -15.200000000 15.280000000 493.883 -15.280000000 15.400000000 246.942 -15.400000000 15.480000000 1396.91 -15.000000000 15.520000000 830.609 -15.280000000 15.560000000 659.255 -15.240000000 15.560000000 698.456 -15.480000000 15.640000000 523.251 -15.640000000 15.720000000 493.883 -15.240000000 15.760000000 130.813 -15.560000000 15.760000000 311.127 -15.560000000 15.800000000 880 -15.720000000 15.840000000 659.255 -15.760000000 15.920000000 523.251 -15.520000000 15.960000000 123.471 -15.840000000 16.000000000 493.883 -15.960000000 16.040000000 659.255 -15.920000000 16.120000000 164.814 -16.040000000 16.160000000 1661.22 -16.120000000 16.200000000 130.813 -16.120000000 16.200000000 659.255 -15.800000000 16.320000000 311.127 -15.760000000 16.360000000 830.609 -16.400000000 16.480000000 739.989 -16.160000000 16.560000000 523.251 -16.400000000 16.720000000 277.183 -16.360000000 16.760000000 880 -16.280000000 17.080000000 110 -17.600000000 17.680000000 415.305 -17.600000000 17.680000000 466.164 -17.760000000 17.920000000 622.254 -17.920000000 18.040000000 369.994 -17.760000000 18.040000000 523.251 -17.920000000 18.080000000 659.255 -18.040000000 18.120000000 554.365 -18.120000000 18.240000000 415.305 -18.040000000 18.240000000 622.254 +5.500000000 6.500000000 659.255 +6.540000000 6.660000000 523.251 +6.360000000 6.760000000 587.33 +6.800000000 6.940000000 523.251 +6.820000000 7.060000000 587.33 +7.120000000 7.260000000 659.255 +7.100000000 7.560000000 523.251 +7.700000000 7.840000000 146.832 +7.820000000 8.400000000 523.251 +8.220000000 8.460000000 246.942 +8.220000000 8.480000000 493.883 +8.440000000 8.740000000 293.665 +8.760000000 9.020000000 523.251 +9.000000000 9.260000000 493.883 +9.060000000 9.280000000 246.942 +9.560000000 9.720000000 220 +10.220000000 10.360000000 329.628 +10.260000000 10.520000000 830.609 +10.640000000 10.800000000 659.255 +10.700000000 10.940000000 103.826 +10.800000000 10.980000000 830.609 +11.020000000 11.240000000 493.883 +11.160000000 11.280000000 246.942 +11.200000000 11.360000000 659.255 +11.260000000 11.420000000 493.883 +11.340000000 11.480000000 830.609 +11.440000000 11.580000000 164.814 +11.540000000 11.720000000 587.33 +11.520000000 11.740000000 82.4069 +11.880000000 12.020000000 830.609 +11.980000000 12.120000000 523.251 +12.240000000 12.360000000 349.228 +12.420000000 12.600000000 830.609 +12.540000000 12.660000000 246.942 +11.980000000 12.680000000 87.3071 +12.560000000 12.760000000 349.228 +12.960000000 13.120000000 830.609 +13.340000000 13.480000000 246.942 +13.080000000 13.520000000 587.33 +13.640000000 13.880000000 82.4069 +14.160000000 14.280000000 698.456 +14.300000000 14.460000000 659.255 +13.460000000 14.520000000 830.609 +14.420000000 14.540000000 246.942 +14.160000000 14.860000000 87.3071 +14.740000000 14.920000000 587.33 +15.100000000 15.220000000 523.251 +15.020000000 15.220000000 830.609 +15.300000000 15.420000000 246.942 +15.300000000 15.420000000 830.609 +15.260000000 15.480000000 698.456 +15.360000000 15.520000000 130.813 +15.500000000 15.620000000 523.251 +15.620000000 15.740000000 123.471 +15.560000000 15.760000000 880 +15.780000000 15.900000000 523.251 +15.800000000 15.940000000 830.609 +15.960000000 16.340000000 830.609 +16.360000000 16.640000000 880 +16.400000000 16.660000000 110
--- a/testdata/TRIOS-silvet/lussier/piano.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/piano.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,139 +1,86 @@ -1.040000000 1.120000000 622.254 -1.160000000 1.240000000 493.883 -1.120000000 1.400000000 110 -1.360000000 1.600000000 523.251 -1.040000000 1.680000000 659.255 -1.680000000 1.800000000 493.883 -1.920000000 2.080000000 523.251 -1.880000000 2.160000000 698.456 -2.720000000 2.800000000 622.254 -1.880000000 2.840000000 220 -2.840000000 2.960000000 440 -2.800000000 3.200000000 195.998 -2.720000000 3.320000000 659.255 -3.280000000 3.520000000 698.456 -3.600000000 3.760000000 523.251 -4.040000000 4.120000000 174.614 -3.160000000 4.160000000 87.3071 -4.160000000 4.320000000 739.989 -4.160000000 4.400000000 587.33 -4.120000000 4.560000000 880 -4.960000000 5.080000000 587.33 -4.960000000 5.120000000 659.255 -4.960000000 5.600000000 220 -5.560000000 5.640000000 493.883 -5.560000000 5.880000000 146.832 -5.520000000 5.920000000 880 -5.800000000 5.960000000 587.33 -5.880000000 6.040000000 73.4162 -6.040000000 6.320000000 523.251 -6.320000000 6.400000000 622.254 -6.400000000 6.480000000 493.883 -6.160000000 6.640000000 587.33 -6.320000000 6.840000000 659.255 -6.480000000 6.920000000 174.614 -7.120000000 7.200000000 622.254 -7.200000000 7.320000000 164.814 -7.120000000 7.320000000 698.456 -7.400000000 7.480000000 164.814 -7.120000000 7.600000000 659.255 -7.720000000 7.800000000 493.883 -7.920000000 8.000000000 73.4162 -7.640000000 8.000000000 587.33 -7.680000000 8.080000000 146.832 -8.040000000 8.200000000 220 -8.120000000 8.280000000 73.4162 -7.600000000 8.480000000 130.813 -8.480000000 8.760000000 698.456 -8.480000000 8.800000000 587.33 -8.520000000 8.960000000 123.471 -9.320000000 9.440000000 587.33 -9.320000000 9.520000000 523.251 -9.640000000 9.800000000 587.33 -9.840000000 10.040000000 246.942 -9.840000000 10.120000000 123.471 -10.000000000 10.120000000 587.33 -10.080000000 10.160000000 622.254 -10.440000000 10.640000000 587.33 -10.240000000 10.680000000 830.609 -10.640000000 10.720000000 622.254 -10.680000000 10.760000000 415.305 -10.720000000 10.800000000 587.33 -10.840000000 10.920000000 415.305 -10.800000000 11.160000000 830.609 +1.120000000 1.260000000 493.883 +1.100000000 1.440000000 110 +1.360000000 1.580000000 523.251 +1.040000000 1.640000000 659.255 +1.640000000 1.780000000 493.883 +1.940000000 2.060000000 523.251 +1.880000000 2.140000000 698.456 +1.900000000 2.660000000 220 +2.820000000 3.120000000 195.998 +2.740000000 3.300000000 659.255 +3.300000000 3.480000000 698.456 +3.580000000 3.780000000 523.251 +3.280000000 4.080000000 87.3071 +4.140000000 4.440000000 587.33 +4.140000000 4.500000000 880 +4.940000000 5.080000000 659.255 +4.960000000 5.560000000 220 +5.600000000 5.740000000 73.4162 +5.560000000 5.760000000 146.832 +5.500000000 5.880000000 880 +5.780000000 5.940000000 587.33 +5.900000000 6.020000000 73.4162 +6.020000000 6.320000000 523.251 +6.140000000 6.580000000 587.33 +6.340000000 6.600000000 659.255 +7.140000000 7.280000000 698.456 +7.120000000 7.400000000 659.255 +7.440000000 7.560000000 659.255 +7.660000000 7.780000000 587.33 +7.680000000 7.920000000 146.832 +7.640000000 8.420000000 130.813 +8.500000000 8.620000000 587.33 +8.480000000 8.720000000 698.456 +8.540000000 8.900000000 123.471 +9.300000000 9.420000000 587.33 +9.340000000 9.480000000 523.251 +9.820000000 10.100000000 123.471 +9.980000000 10.100000000 587.33 +10.100000000 10.540000000 659.255 +10.240000000 10.600000000 830.609 +10.520000000 10.640000000 587.33 +10.640000000 10.780000000 415.305 +10.640000000 10.900000000 659.255 +10.800000000 10.980000000 830.609 +11.000000000 11.140000000 830.609 11.080000000 11.200000000 587.33 -10.560000000 11.400000000 103.826 -10.080000000 11.440000000 659.255 -11.320000000 11.480000000 311.127 -11.480000000 11.600000000 329.628 -11.320000000 11.600000000 830.609 -11.720000000 11.800000000 622.254 -11.480000000 11.840000000 587.33 -11.360000000 11.920000000 82.4069 -11.640000000 12.000000000 164.814 -11.720000000 12.000000000 659.255 -11.840000000 12.080000000 830.609 -12.040000000 12.200000000 622.254 -12.160000000 12.320000000 587.33 -12.160000000 12.360000000 174.614 -12.000000000 12.400000000 349.228 -12.640000000 12.720000000 174.614 -12.400000000 12.760000000 830.609 -11.800000000 12.840000000 87.3071 -12.480000000 12.840000000 587.33 -12.800000000 12.920000000 698.456 -12.840000000 12.920000000 739.989 -12.920000000 13.040000000 440 -12.880000000 13.120000000 73.4162 -12.760000000 13.120000000 293.665 -13.120000000 13.200000000 493.883 -13.040000000 13.240000000 220 -12.760000000 13.280000000 146.832 -13.160000000 13.360000000 73.4162 -13.200000000 13.360000000 587.33 -13.320000000 13.440000000 698.456 -13.400000000 13.560000000 146.832 -12.920000000 13.680000000 830.609 -13.600000000 13.720000000 293.665 -13.600000000 13.760000000 246.942 -13.560000000 13.880000000 164.814 -13.840000000 13.960000000 698.456 -13.520000000 14.120000000 82.4069 -13.720000000 14.160000000 587.33 -13.960000000 14.200000000 830.609 -13.960000000 14.240000000 164.814 -14.160000000 14.360000000 349.228 -14.160000000 14.360000000 622.254 -14.360000000 14.480000000 587.33 -14.320000000 14.600000000 659.255 -14.360000000 14.640000000 830.609 -14.520000000 14.680000000 329.628 -14.360000000 14.880000000 174.614 -14.640000000 14.880000000 659.255 -14.680000000 14.960000000 587.33 -14.880000000 15.040000000 293.665 -14.600000000 15.200000000 82.4069 -14.880000000 15.200000000 146.832 -15.120000000 15.320000000 293.665 -15.320000000 15.480000000 587.33 -13.960000000 15.520000000 87.3071 -15.280000000 15.560000000 659.255 -15.560000000 15.640000000 739.989 -15.200000000 15.800000000 130.813 -15.280000000 16.040000000 830.609 -16.080000000 16.200000000 830.609 -15.640000000 16.240000000 659.255 -15.840000000 16.320000000 130.813 -15.520000000 16.360000000 123.471 -15.560000000 16.400000000 311.127 -16.360000000 16.520000000 739.989 -16.560000000 16.680000000 391.995 -16.320000000 16.720000000 523.251 -16.360000000 16.760000000 880 -16.480000000 16.880000000 277.183 -16.200000000 17.200000000 110 -17.800000000 17.920000000 1760 -17.840000000 17.960000000 523.251 -17.840000000 17.960000000 554.365 -18.000000000 18.080000000 1244.51 -18.040000000 18.160000000 1760 +10.580000000 11.260000000 103.826 +11.180000000 11.440000000 659.255 +11.460000000 11.580000000 164.814 +11.340000000 11.580000000 830.609 +11.620000000 11.780000000 587.33 +11.660000000 11.840000000 164.814 +11.400000000 11.860000000 82.4069 +11.740000000 11.860000000 659.255 +11.860000000 12.040000000 830.609 +12.140000000 12.260000000 349.228 +12.160000000 12.280000000 587.33 +11.940000000 12.740000000 87.3071 +12.420000000 12.740000000 830.609 +12.680000000 12.800000000 587.33 +12.800000000 12.920000000 293.665 +12.820000000 12.980000000 146.832 +12.940000000 13.300000000 830.609 +13.440000000 13.660000000 830.609 +13.740000000 13.860000000 587.33 +13.620000000 14.000000000 82.4069 +13.960000000 14.160000000 830.609 +14.360000000 14.540000000 659.255 +14.360000000 14.540000000 830.609 +14.600000000 14.720000000 329.628 +14.620000000 14.760000000 82.4069 +14.800000000 14.920000000 82.4069 +14.120000000 14.960000000 87.3071 +14.960000000 15.100000000 146.832 +15.100000000 15.260000000 87.3071 +15.280000000 15.400000000 659.255 +15.280000000 15.480000000 830.609 +15.280000000 15.660000000 130.813 +15.760000000 15.880000000 659.255 +15.540000000 15.920000000 123.471 +15.740000000 15.940000000 830.609 +15.600000000 15.960000000 311.127 +15.920000000 16.040000000 659.255 +16.360000000 16.520000000 523.251 +16.380000000 16.580000000 880 +16.360000000 16.940000000 110
--- a/testdata/TRIOS-silvet/lussier/piano_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/piano_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,170 +1,93 @@ -1.040000000 1.160000000 659.255 -1.040000000 1.320000000 493.883 -1.640000000 1.720000000 246.942 +1.000000000 1.120000000 116.541 +1.040000000 1.180000000 659.255 +1.020000000 1.400000000 493.883 +1.340000000 1.740000000 523.251 1.000000000 2.040000000 110 -1.880000000 2.080000000 698.456 -2.080000000 2.160000000 440 -1.600000000 2.200000000 493.883 -1.360000000 2.400000000 523.251 -1.920000000 2.880000000 220 -2.720000000 2.880000000 659.255 -2.800000000 3.240000000 195.998 -2.840000000 3.280000000 440 -3.280000000 3.400000000 698.456 -3.320000000 3.680000000 493.883 +1.600000000 2.160000000 493.883 +1.880000000 2.240000000 523.251 +1.940000000 2.780000000 220 +2.740000000 2.860000000 659.255 +2.820000000 2.940000000 220 +2.780000000 3.180000000 440 +2.820000000 3.220000000 195.998 +3.340000000 3.580000000 493.883 +3.580000000 3.840000000 523.251 +3.360000000 3.860000000 87.3071 3.840000000 4.000000000 493.883 -3.600000000 4.000000000 523.251 -3.280000000 4.160000000 87.3071 -4.240000000 4.360000000 493.883 -4.120000000 4.360000000 880 -4.120000000 4.600000000 587.33 -4.520000000 4.640000000 493.883 -4.000000000 4.880000000 246.942 -4.960000000 5.120000000 659.255 -5.240000000 5.320000000 440 -4.920000000 5.360000000 587.33 -4.880000000 5.520000000 220 -5.480000000 5.560000000 246.942 -5.520000000 5.720000000 880 -5.560000000 5.880000000 493.883 -5.760000000 6.120000000 587.33 -5.360000000 6.320000000 73.4162 -6.000000000 6.360000000 523.251 -6.320000000 6.520000000 659.255 -6.320000000 6.680000000 493.883 -6.320000000 6.760000000 587.33 -6.360000000 6.800000000 174.614 -6.320000000 6.840000000 349.228 -6.880000000 7.000000000 349.228 -6.840000000 7.120000000 174.614 -7.120000000 7.240000000 659.255 -7.120000000 7.400000000 329.628 -7.120000000 7.400000000 698.456 -7.120000000 7.720000000 164.814 -7.640000000 7.760000000 587.33 -7.720000000 7.800000000 293.665 -7.600000000 7.920000000 493.883 -7.800000000 8.000000000 587.33 -8.040000000 8.120000000 195.998 -7.760000000 8.400000000 130.813 -7.640000000 8.480000000 391.995 -8.480000000 8.840000000 493.883 -8.520000000 8.880000000 369.994 -8.480000000 8.880000000 587.33 -8.480000000 9.200000000 123.471 -8.960000000 9.200000000 369.994 -7.520000000 9.280000000 73.4162 -9.240000000 9.720000000 587.33 -9.240000000 9.800000000 523.251 -9.960000000 10.040000000 493.883 -9.800000000 10.240000000 246.942 -9.840000000 10.280000000 369.994 -10.080000000 10.320000000 659.255 -9.960000000 10.360000000 587.33 -10.320000000 10.480000000 369.994 -10.240000000 10.520000000 830.609 -9.760000000 10.560000000 123.471 -10.440000000 10.600000000 493.883 -10.280000000 10.640000000 246.942 -10.520000000 10.640000000 369.994 -10.480000000 10.680000000 587.33 -10.640000000 10.840000000 659.255 -10.840000000 10.960000000 830.609 -10.640000000 11.000000000 207.652 -10.640000000 11.160000000 415.305 -10.960000000 11.240000000 493.883 -11.040000000 11.400000000 587.33 -11.200000000 11.400000000 659.255 -10.560000000 11.480000000 103.826 -11.400000000 11.520000000 164.814 -11.320000000 11.520000000 830.609 -11.440000000 11.600000000 329.628 -11.480000000 11.760000000 493.883 -11.640000000 11.800000000 164.814 -11.720000000 11.920000000 659.255 -11.600000000 11.960000000 587.33 -11.920000000 12.040000000 164.814 -11.880000000 12.040000000 830.609 -12.000000000 12.080000000 246.942 -11.280000000 12.120000000 82.4069 -12.040000000 12.320000000 493.883 -11.960000000 12.520000000 349.228 -12.120000000 12.520000000 587.33 -12.280000000 12.520000000 659.255 -12.040000000 12.640000000 87.3071 -12.600000000 12.680000000 246.942 -12.440000000 12.680000000 830.609 -12.600000000 12.720000000 164.814 -12.520000000 12.800000000 493.883 -12.640000000 12.880000000 587.33 -12.800000000 13.040000000 659.255 -12.960000000 13.200000000 830.609 -13.040000000 13.360000000 493.883 -13.200000000 13.360000000 587.33 -13.360000000 13.440000000 293.665 -13.320000000 13.520000000 659.255 -12.760000000 13.560000000 73.4162 -13.480000000 13.560000000 587.33 -13.560000000 13.680000000 329.628 -13.440000000 13.680000000 830.609 -13.560000000 13.720000000 164.814 -13.800000000 13.880000000 164.814 -13.560000000 13.880000000 493.883 -13.840000000 14.080000000 659.255 -13.720000000 14.120000000 587.33 -13.480000000 14.160000000 82.4069 -14.000000000 14.200000000 830.609 -14.120000000 14.360000000 349.228 +3.880000000 4.020000000 87.3071 +4.120000000 4.440000000 587.33 +4.100000000 4.560000000 246.942 +4.920000000 5.240000000 587.33 +4.920000000 5.480000000 220 +5.520000000 5.760000000 493.883 +5.760000000 6.040000000 587.33 +5.480000000 6.300000000 73.4162 +6.020000000 6.320000000 523.251 +6.320000000 6.460000000 659.255 +6.420000000 6.580000000 174.614 +6.340000000 6.600000000 493.883 +6.320000000 6.640000000 587.33 +6.600000000 6.740000000 174.614 +7.100000000 7.320000000 329.628 +7.640000000 7.860000000 493.883 +7.640000000 7.880000000 587.33 +7.640000000 7.900000000 391.995 +7.620000000 8.520000000 73.4162 +8.460000000 8.620000000 493.883 +8.560000000 8.700000000 73.4162 +8.460000000 8.720000000 587.33 +8.500000000 8.780000000 123.471 +8.840000000 8.980000000 123.471 +9.260000000 9.600000000 587.33 +9.280000000 9.660000000 523.251 +9.820000000 10.020000000 246.942 +9.960000000 10.240000000 587.33 +10.100000000 10.240000000 659.255 +10.260000000 10.380000000 830.609 +9.840000000 10.440000000 123.471 +10.360000000 10.580000000 246.942 +10.500000000 10.660000000 587.33 +10.640000000 10.780000000 659.255 +10.760000000 10.880000000 415.305 +10.940000000 11.160000000 493.883 +11.060000000 11.280000000 587.33 +10.600000000 11.320000000 103.826 +11.200000000 11.320000000 659.255 +11.340000000 11.460000000 830.609 +11.600000000 11.800000000 164.814 +11.600000000 11.860000000 587.33 +11.740000000 11.860000000 659.255 +11.360000000 12.000000000 82.4069 +11.880000000 12.000000000 830.609 +12.000000000 12.220000000 493.883 +12.060000000 12.320000000 87.3071 +12.120000000 12.360000000 587.33 +12.300000000 12.420000000 659.255 +12.440000000 12.560000000 830.609 +12.540000000 12.780000000 493.883 +12.660000000 12.820000000 587.33 +12.820000000 12.940000000 659.255 +12.960000000 13.080000000 830.609 +13.060000000 13.300000000 493.883 +12.840000000 13.320000000 73.4162 +13.200000000 13.400000000 587.33 +13.340000000 13.460000000 659.255 +13.460000000 13.580000000 830.609 +13.720000000 13.940000000 587.33 +13.860000000 13.980000000 659.255 +13.600000000 14.060000000 82.4069 +13.980000000 14.120000000 830.609 14.360000000 14.480000000 659.255 -14.120000000 14.520000000 87.3071 -14.360000000 14.520000000 830.609 -14.320000000 14.640000000 493.883 -14.520000000 14.720000000 329.628 -14.680000000 14.800000000 164.814 -14.520000000 14.840000000 349.228 -14.360000000 14.880000000 587.33 -14.960000000 15.240000000 146.832 -14.480000000 15.280000000 82.4069 -14.880000000 15.320000000 73.4162 -15.280000000 15.360000000 246.942 -15.280000000 15.360000000 830.609 -15.280000000 15.400000000 195.998 +14.380000000 14.500000000 830.609 +14.140000000 14.520000000 87.3071 +14.360000000 14.620000000 587.33 +14.520000000 15.200000000 82.4069 +14.960000000 15.300000000 73.4162 15.280000000 15.400000000 659.255 -15.360000000 15.440000000 493.883 -15.440000000 15.520000000 65.4064 -15.400000000 15.520000000 830.609 -15.320000000 15.560000000 587.33 -15.520000000 15.600000000 246.942 -15.400000000 15.760000000 73.4162 -15.600000000 15.760000000 123.471 -15.520000000 15.760000000 195.998 -15.360000000 15.840000000 391.995 +15.280000000 15.420000000 587.33 +15.300000000 15.480000000 164.814 +15.320000000 15.520000000 195.998 15.760000000 15.880000000 587.33 -15.760000000 15.920000000 493.883 -15.760000000 15.920000000 659.255 -15.760000000 15.960000000 830.609 -15.920000000 16.040000000 130.813 -16.000000000 16.120000000 65.4064 -15.920000000 16.280000000 123.471 -16.240000000 16.320000000 369.994 -15.840000000 16.360000000 195.998 -15.880000000 16.400000000 391.995 -16.360000000 16.520000000 880 -16.480000000 16.600000000 493.883 -16.360000000 16.720000000 164.814 -16.360000000 16.840000000 523.251 -16.280000000 17.480000000 110 -17.560000000 17.640000000 87.3071 -17.560000000 17.680000000 261.626 -17.600000000 17.680000000 1760 -17.640000000 17.720000000 587.33 -17.680000000 17.760000000 466.164 -17.680000000 17.800000000 659.255 -17.720000000 17.840000000 622.254 -17.760000000 17.880000000 1244.51 -17.800000000 17.880000000 1661.22 -17.800000000 17.920000000 493.883 -17.760000000 17.920000000 1479.98 -18.120000000 18.240000000 554.365 -18.120000000 18.240000000 587.33 -18.120000000 18.240000000 659.255 +15.940000000 16.080000000 391.995 +16.360000000 16.580000000 523.251 +16.360000000 17.320000000 110
--- a/testdata/TRIOS-silvet/lussier/trumpet.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/trumpet.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,99 +1,48 @@ -1.080000000 1.240000000 1479.98 -1.360000000 1.520000000 1479.98 -1.640000000 1.720000000 246.942 -1.640000000 1.960000000 1479.98 -1.080000000 2.040000000 493.883 -1.960000000 2.080000000 466.164 -2.000000000 2.080000000 880 -2.160000000 2.240000000 880 -2.120000000 2.480000000 466.164 -2.560000000 2.720000000 466.164 -2.000000000 2.800000000 440 -2.800000000 2.880000000 1174.66 -2.960000000 3.040000000 1174.66 -3.080000000 3.200000000 415.305 -3.040000000 3.320000000 783.991 -2.760000000 3.400000000 391.995 -3.360000000 3.440000000 1046.5 -3.480000000 3.600000000 1567.98 -3.640000000 3.960000000 1567.98 -4.000000000 4.120000000 1567.98 -3.520000000 4.160000000 1046.5 -3.320000000 4.280000000 523.251 -4.160000000 4.440000000 1479.98 -4.360000000 4.560000000 987.767 -4.520000000 4.640000000 1479.98 -4.600000000 4.760000000 987.767 -4.200000000 4.920000000 493.883 -4.800000000 4.920000000 1479.98 -4.880000000 4.960000000 523.251 -4.960000000 5.480000000 440 -5.320000000 5.520000000 466.164 -5.520000000 5.720000000 1318.51 -5.800000000 5.920000000 1318.51 -5.920000000 6.160000000 698.456 -5.440000000 6.440000000 659.255 -6.640000000 6.800000000 1760 -6.440000000 6.880000000 1174.66 -6.360000000 7.080000000 587.33 -7.080000000 7.200000000 1046.5 -7.320000000 7.600000000 1567.98 -7.720000000 7.920000000 1567.98 -8.120000000 8.200000000 1567.98 -7.240000000 8.240000000 1046.5 -8.400000000 8.480000000 1567.98 -8.320000000 8.520000000 1046.5 -7.080000000 8.560000000 523.251 -8.520000000 9.240000000 493.883 -9.880000000 10.120000000 659.255 -10.360000000 10.600000000 987.767 -9.800000000 10.640000000 329.628 -10.360000000 10.640000000 1661.22 -10.240000000 10.680000000 659.255 -10.880000000 11.280000000 987.767 -10.800000000 11.400000000 1479.98 -10.680000000 11.440000000 493.883 -11.360000000 11.480000000 523.251 -11.480000000 11.600000000 1760 -11.720000000 11.840000000 1760 -11.720000000 11.880000000 1174.66 -11.480000000 11.920000000 587.33 -12.320000000 12.400000000 698.456 -12.600000000 12.760000000 698.456 -12.280000000 12.760000000 1760 -12.160000000 12.800000000 1046.5 -11.920000000 12.880000000 349.228 -12.840000000 12.960000000 1174.66 -12.840000000 13.480000000 1760 -13.080000000 13.600000000 1174.66 -12.800000000 13.640000000 587.33 -13.520000000 13.640000000 1760 -13.640000000 14.040000000 1661.22 -13.600000000 14.520000000 830.609 -14.480000000 14.600000000 1760 -14.480000000 14.800000000 1174.66 -14.640000000 14.960000000 1760 -14.480000000 15.000000000 587.33 -15.200000000 15.280000000 880 -14.960000000 15.320000000 830.609 -15.320000000 15.480000000 739.989 -15.280000000 15.520000000 1396.91 -15.240000000 15.600000000 698.456 -15.520000000 15.840000000 880 -15.840000000 16.320000000 1661.22 -15.800000000 16.400000000 830.609 -16.320000000 16.760000000 880 -17.560000000 17.640000000 69.2957 -17.560000000 17.640000000 82.4069 -17.560000000 17.640000000 138.591 -17.600000000 17.680000000 246.942 -17.600000000 17.680000000 261.626 -17.800000000 17.880000000 493.883 -17.760000000 17.920000000 523.251 -17.960000000 18.040000000 73.4162 -18.040000000 18.160000000 220 -18.120000000 18.240000000 523.251 -18.160000000 18.240000000 932.328 -18.120000000 18.240000000 987.767 -18.120000000 18.240000000 1046.5 -18.160000000 18.240000000 1567.98 +1.060000000 1.580000000 1479.98 +1.620000000 1.760000000 1479.98 +1.820000000 1.960000000 1479.98 +1.040000000 2.020000000 493.883 +2.060000000 2.220000000 466.164 +2.000000000 2.360000000 440 +2.280000000 2.480000000 466.164 +2.460000000 2.580000000 440 +2.640000000 2.760000000 440 +2.800000000 3.340000000 391.995 +3.520000000 3.640000000 1046.5 +3.340000000 4.200000000 523.251 +4.760000000 4.900000000 1479.98 +4.180000000 4.940000000 493.883 +4.960000000 5.140000000 440 +5.100000000 5.260000000 466.164 +5.200000000 5.380000000 440 +5.380000000 5.500000000 466.164 +5.480000000 6.400000000 659.255 +6.380000000 7.060000000 587.33 +7.100000000 7.560000000 523.251 +7.920000000 8.040000000 1567.98 +7.840000000 8.060000000 1046.5 +7.620000000 8.560000000 523.251 +8.560000000 8.840000000 493.883 +10.500000000 10.620000000 659.255 +9.940000000 10.660000000 329.628 +10.660000000 11.440000000 493.883 +11.620000000 11.740000000 1174.66 +11.460000000 11.900000000 587.33 +12.260000000 12.400000000 698.456 +12.620000000 12.740000000 698.456 +12.340000000 12.740000000 1760 +11.940000000 12.800000000 349.228 +12.980000000 13.160000000 1760 +13.140000000 13.260000000 1174.66 +13.240000000 13.400000000 1760 +12.800000000 13.600000000 587.33 +13.600000000 14.480000000 830.609 +14.600000000 14.720000000 1174.66 +14.700000000 14.820000000 1760 +14.480000000 14.960000000 587.33 +14.980000000 15.240000000 830.609 +15.240000000 15.500000000 698.456 +15.540000000 15.820000000 880 +16.000000000 16.140000000 1661.22 +15.820000000 16.360000000 830.609 +16.340000000 16.680000000 880
--- a/testdata/TRIOS-silvet/lussier/trumpet_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/lussier/trumpet_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,76 +1,38 @@ -1.120000000 1.200000000 1479.98 -1.320000000 1.440000000 1479.98 -1.640000000 1.720000000 1479.98 -1.080000000 2.040000000 493.883 -1.240000000 2.080000000 987.767 -2.240000000 2.320000000 880 -2.000000000 2.320000000 1318.51 -2.000000000 2.840000000 440 -3.040000000 3.200000000 783.991 -2.920000000 3.360000000 1567.98 -2.760000000 3.400000000 391.995 -3.480000000 4.160000000 1567.98 -3.440000000 4.240000000 1046.5 -3.320000000 4.280000000 523.251 -4.480000000 4.600000000 1479.98 -4.320000000 5.000000000 987.767 -4.240000000 5.040000000 493.883 -5.000000000 5.200000000 1318.51 -4.960000000 5.520000000 440 -5.480000000 5.600000000 987.767 -5.840000000 6.080000000 987.767 -5.440000000 6.240000000 1318.51 -6.280000000 6.360000000 698.456 -6.360000000 6.440000000 987.767 -6.280000000 6.440000000 1318.51 -5.520000000 6.520000000 659.255 -6.360000000 7.120000000 587.33 -6.400000000 7.120000000 1174.66 -7.240000000 7.600000000 1567.98 -7.240000000 7.640000000 1046.5 -7.760000000 8.200000000 1567.98 -8.400000000 8.480000000 1567.98 -7.760000000 8.600000000 1046.5 -7.080000000 8.640000000 523.251 -8.560000000 9.320000000 493.883 -8.720000000 9.360000000 987.767 -9.840000000 10.120000000 659.255 -10.480000000 10.600000000 659.255 -9.880000000 10.680000000 987.767 -9.800000000 10.720000000 329.628 -10.760000000 10.960000000 1479.98 -11.040000000 11.160000000 1479.98 -11.400000000 11.480000000 1479.98 -10.760000000 11.520000000 987.767 -10.680000000 11.560000000 493.883 -11.480000000 11.960000000 587.33 -11.560000000 11.960000000 1174.66 -11.960000000 12.880000000 349.228 -12.840000000 13.000000000 1174.66 -12.960000000 13.040000000 1760 -12.800000000 13.640000000 587.33 -13.040000000 13.680000000 1174.66 -13.720000000 13.960000000 1661.22 -14.400000000 14.480000000 1661.22 -13.600000000 14.520000000 830.609 -14.600000000 14.960000000 1174.66 -14.520000000 15.040000000 587.33 -15.200000000 15.280000000 1661.22 -14.960000000 15.320000000 830.609 -15.320000000 15.520000000 1396.91 -15.280000000 15.600000000 698.456 -15.520000000 15.840000000 880 -15.640000000 15.840000000 1760 -16.000000000 16.160000000 1661.22 -16.280000000 16.360000000 1661.22 -15.800000000 16.400000000 830.609 -16.520000000 16.920000000 1760 -16.360000000 16.960000000 880 -17.600000000 17.680000000 369.994 -17.600000000 17.680000000 466.164 -17.600000000 17.680000000 587.33 -17.600000000 17.680000000 622.254 -17.600000000 17.680000000 659.255 -17.760000000 17.840000000 220 -17.760000000 17.840000000 987.767 -17.760000000 17.840000000 1479.98 +1.200000000 2.000000000 987.767 +1.040000000 2.040000000 493.883 +2.000000000 2.800000000 440 +2.800000000 3.360000000 391.995 +3.520000000 3.680000000 1046.5 +3.360000000 4.160000000 523.251 +3.720000000 4.200000000 1046.5 +4.540000000 4.660000000 987.767 +4.200000000 4.980000000 493.883 +5.000000000 5.520000000 440 +5.660000000 5.860000000 1318.51 +5.900000000 6.100000000 1318.51 +5.480000000 6.460000000 659.255 +6.700000000 6.920000000 1174.66 +6.400000000 7.080000000 587.33 +7.860000000 8.020000000 1046.5 +8.380000000 8.500000000 1046.5 +7.100000000 8.600000000 523.251 +8.600000000 9.320000000 493.883 +9.860000000 10.660000000 329.628 +10.900000000 11.040000000 987.767 +11.100000000 11.300000000 987.767 +11.340000000 11.460000000 987.767 +10.700000000 11.500000000 493.883 +11.660000000 11.880000000 1174.66 +11.520000000 11.920000000 587.33 +12.000000000 12.840000000 349.228 +12.860000000 13.620000000 1174.66 +12.820000000 13.640000000 587.33 +13.600000000 14.480000000 830.609 +14.800000000 14.960000000 1174.66 +14.540000000 14.980000000 587.33 +14.980000000 15.280000000 830.609 +15.320000000 15.560000000 698.456 +15.540000000 15.820000000 880 +15.800000000 16.160000000 830.609 +16.180000000 16.380000000 830.609 +16.360000000 16.940000000 880
--- a/testdata/TRIOS-silvet/mozart/clarinet.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/clarinet.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,106 +1,62 @@ -1.720000000 1.840000000 293.665 -2.360000000 2.440000000 293.665 -2.680000000 2.760000000 293.665 -1.520000000 3.000000000 587.33 -2.960000000 3.520000000 698.456 -3.320000000 3.520000000 1396.91 -3.960000000 4.040000000 587.33 -3.440000000 4.040000000 622.254 -3.960000000 4.520000000 523.251 -4.520000000 4.600000000 1396.91 -5.160000000 5.280000000 233.082 -5.560000000 5.640000000 1396.91 -4.480000000 5.960000000 466.164 -6.040000000 6.120000000 246.942 -5.960000000 6.280000000 493.883 -6.200000000 7.440000000 523.251 -7.400000000 7.760000000 554.365 -7.680000000 8.960000000 587.33 -9.040000000 9.120000000 1396.91 -9.200000000 9.280000000 1396.91 -9.000000000 9.320000000 698.456 -9.240000000 9.560000000 622.254 -10.920000000 11.000000000 739.989 -10.600000000 11.040000000 1396.91 -11.160000000 11.240000000 1396.91 -10.440000000 11.280000000 698.456 -11.200000000 11.280000000 739.989 -11.200000000 11.520000000 783.991 -11.440000000 11.800000000 880 -11.840000000 12.160000000 987.767 -11.720000000 12.320000000 932.328 -12.480000000 12.560000000 830.609 -12.240000000 12.560000000 880 -12.680000000 12.760000000 739.989 -12.480000000 12.760000000 783.991 -12.920000000 13.000000000 349.228 -12.680000000 13.040000000 698.456 -12.960000000 13.280000000 622.254 -13.200000000 13.320000000 587.33 -13.240000000 13.480000000 523.251 -13.480000000 13.720000000 440 -13.680000000 14.320000000 466.164 -14.360000000 14.880000000 466.164 -14.840000000 14.920000000 246.942 -14.920000000 15.200000000 493.883 -15.120000000 16.440000000 523.251 -16.400000000 16.760000000 554.365 -16.680000000 17.960000000 587.33 -17.960000000 18.280000000 698.456 -18.240000000 18.520000000 622.254 -19.480000000 19.560000000 739.989 -19.480000000 20.080000000 1396.91 -20.200000000 20.360000000 1396.91 -20.440000000 20.600000000 1396.91 -20.760000000 20.880000000 783.991 -20.920000000 21.040000000 659.255 -19.480000000 21.160000000 698.456 -21.080000000 21.160000000 739.989 -21.120000000 21.680000000 830.609 -22.080000000 22.160000000 739.989 -21.600000000 22.160000000 783.991 -22.080000000 22.600000000 587.33 -22.600000000 23.080000000 698.456 -23.400000000 23.520000000 1318.51 -23.480000000 23.560000000 622.254 -23.040000000 23.560000000 659.255 -23.520000000 24.040000000 523.251 -24.000000000 25.040000000 622.254 -25.000000000 25.200000000 1174.66 -25.240000000 25.600000000 1174.66 -25.640000000 25.760000000 1174.66 -24.960000000 25.800000000 587.33 -25.720000000 26.000000000 523.251 -25.960000000 26.280000000 622.254 -26.440000000 26.520000000 391.995 -26.480000000 26.560000000 739.989 -26.240000000 26.560000000 783.991 -26.480000000 26.800000000 622.254 -26.720000000 27.040000000 523.251 -27.040000000 27.360000000 466.164 -27.320000000 27.480000000 233.082 -27.880000000 27.960000000 1396.91 -27.440000000 28.040000000 466.164 -28.200000000 28.280000000 554.365 -27.960000000 28.280000000 587.33 -28.200000000 28.560000000 523.251 -28.520000000 29.000000000 466.164 -28.960000000 29.520000000 293.665 -29.520000000 29.600000000 1396.91 -29.440000000 30.000000000 349.228 -29.960000000 30.520000000 466.164 -30.440000000 31.000000000 349.228 -31.000000000 31.560000000 466.164 -31.480000000 32.400000000 587.33 -35.760000000 35.840000000 391.995 -35.760000000 35.840000000 659.255 -35.760000000 35.840000000 783.991 -35.760000000 35.840000000 1396.91 -35.760000000 35.880000000 369.994 -35.840000000 35.920000000 466.164 -35.920000000 36.000000000 369.994 -35.920000000 36.000000000 554.365 -36.160000000 36.240000000 1479.98 -36.200000000 36.280000000 493.883 -36.240000000 36.320000000 466.164 -36.160000000 36.320000000 554.365 +1.700000000 1.820000000 622.254 +1.860000000 2.000000000 622.254 +1.460000000 2.980000000 587.33 +3.000000000 3.500000000 698.456 +3.460000000 4.000000000 622.254 +4.000000000 4.460000000 523.251 +4.500000000 4.660000000 466.164 +5.000000000 5.240000000 466.164 +5.560000000 5.700000000 466.164 +6.040000000 6.240000000 493.883 +6.220000000 6.680000000 523.251 +6.980000000 7.260000000 523.251 +7.480000000 7.740000000 554.365 +7.660000000 8.300000000 587.33 +8.480000000 8.860000000 587.33 +9.000000000 9.300000000 698.456 +9.260000000 9.480000000 622.254 +10.480000000 11.260000000 698.456 +11.240000000 11.480000000 783.991 +11.480000000 11.740000000 880 +11.740000000 12.280000000 932.328 +12.260000000 12.500000000 880 +12.520000000 12.740000000 783.991 +12.720000000 13.000000000 698.456 +12.980000000 13.260000000 622.254 +13.280000000 13.420000000 523.251 +13.700000000 14.100000000 466.164 +14.460000000 14.640000000 466.164 +14.920000000 15.140000000 493.883 +15.140000000 15.680000000 523.251 +15.940000000 16.320000000 523.251 +16.480000000 16.720000000 554.365 +16.660000000 17.280000000 587.33 +17.440000000 17.920000000 587.33 +17.980000000 18.260000000 698.456 +18.240000000 18.400000000 622.254 +19.480000000 20.780000000 698.456 +20.860000000 20.980000000 698.456 +21.020000000 21.140000000 698.456 +21.120000000 21.660000000 830.609 +21.640000000 22.120000000 783.991 +22.120000000 22.600000000 587.33 +22.620000000 23.060000000 698.456 +23.060000000 23.520000000 659.255 +23.580000000 24.000000000 523.251 +24.040000000 25.000000000 622.254 +24.960000000 25.760000000 587.33 +25.760000000 25.960000000 523.251 +25.960000000 26.240000000 622.254 +26.240000000 26.520000000 783.991 +26.520000000 26.760000000 622.254 +26.780000000 27.000000000 523.251 +27.200000000 27.980000000 466.164 +27.980000000 28.240000000 587.33 +28.240000000 28.480000000 523.251 +28.560000000 28.940000000 466.164 +29.060000000 29.480000000 293.665 +29.500000000 29.940000000 349.228 +30.060000000 30.460000000 466.164 +30.480000000 30.940000000 349.228 +31.040000000 31.500000000 466.164 +31.480000000 32.240000000 587.33
--- a/testdata/TRIOS-silvet/mozart/clarinet_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/clarinet_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,87 +1,44 @@ -1.680000000 1.840000000 293.665 -1.720000000 1.840000000 1760 -1.520000000 2.080000000 1174.66 -2.680000000 2.760000000 1760 -2.680000000 3.000000000 1174.66 -1.480000000 3.080000000 587.33 -3.000000000 3.600000000 698.456 -3.480000000 4.120000000 622.254 -4.000000000 4.520000000 523.251 -4.480000000 6.040000000 466.164 -6.040000000 6.120000000 246.942 -6.120000000 6.240000000 1479.98 -6.040000000 6.320000000 493.883 -6.520000000 6.600000000 1567.98 -6.280000000 7.480000000 523.251 -7.480000000 7.720000000 554.365 -7.800000000 7.920000000 1174.66 -8.040000000 8.520000000 1174.66 -8.640000000 8.720000000 1174.66 -8.880000000 8.960000000 1174.66 -7.720000000 9.040000000 587.33 -9.000000000 9.400000000 698.456 -9.280000000 9.720000000 622.254 -10.920000000 11.000000000 1396.91 -10.480000000 11.360000000 698.456 -11.240000000 11.640000000 783.991 -11.480000000 11.840000000 880 -11.760000000 12.360000000 932.328 -12.280000000 12.600000000 880 -12.480000000 12.880000000 783.991 -12.760000000 13.080000000 698.456 -13.000000000 13.360000000 622.254 -13.280000000 13.520000000 523.251 -13.480000000 13.800000000 440 -13.720000000 14.960000000 466.164 -15.000000000 15.200000000 1479.98 -14.920000000 15.240000000 493.883 -15.200000000 15.280000000 1567.98 -15.800000000 15.880000000 1567.98 -15.200000000 16.480000000 523.251 -16.440000000 16.720000000 554.365 -16.760000000 16.960000000 1174.66 -17.040000000 17.200000000 1174.66 -17.240000000 17.520000000 1174.66 -17.640000000 17.840000000 1174.66 -17.920000000 18.000000000 1174.66 -16.720000000 18.080000000 587.33 -18.000000000 18.360000000 698.456 -18.520000000 18.600000000 1244.51 -18.240000000 18.680000000 622.254 -20.800000000 20.960000000 783.991 -20.960000000 21.120000000 659.255 -19.480000000 21.200000000 698.456 -21.160000000 21.720000000 830.609 -21.640000000 22.240000000 783.991 -22.280000000 22.480000000 1174.66 -22.120000000 22.720000000 587.33 -22.640000000 23.160000000 698.456 -23.040000000 23.640000000 659.255 -23.560000000 24.080000000 523.251 -24.640000000 24.760000000 1244.51 -24.040000000 25.080000000 622.254 -25.000000000 25.200000000 1174.66 -25.320000000 25.560000000 1760 -25.240000000 25.640000000 1174.66 -24.960000000 25.840000000 587.33 -25.800000000 26.040000000 523.251 -25.960000000 26.360000000 622.254 -26.240000000 26.640000000 783.991 -26.520000000 26.880000000 622.254 -26.760000000 27.040000000 523.251 -27.320000000 27.480000000 233.082 -27.600000000 27.960000000 1396.91 -27.000000000 28.120000000 466.164 -28.040000000 28.240000000 1174.66 -28.000000000 28.320000000 587.33 -28.240000000 28.400000000 1567.98 -28.240000000 28.560000000 523.251 -28.520000000 29.080000000 466.164 -28.960000000 29.600000000 293.665 -29.440000000 30.120000000 349.228 -29.920000000 30.600000000 466.164 -30.440000000 31.080000000 349.228 -30.920000000 31.600000000 466.164 -31.760000000 32.160000000 1174.66 -31.520000000 32.640000000 587.33 -35.760000000 35.840000000 1661.22 +1.560000000 1.720000000 1174.66 +1.440000000 3.040000000 587.33 +3.040000000 3.540000000 698.456 +3.500000000 4.060000000 622.254 +4.500000000 6.000000000 466.164 +6.060000000 6.260000000 493.883 +7.740000000 9.040000000 587.33 +9.040000000 9.340000000 698.456 +9.320000000 9.680000000 622.254 +10.520000000 11.320000000 698.456 +11.260000000 11.560000000 783.991 +11.520000000 11.800000000 880 +11.780000000 12.320000000 932.328 +12.300000000 12.540000000 880 +12.520000000 12.800000000 783.991 +12.780000000 13.020000000 698.456 +13.040000000 13.300000000 622.254 +13.520000000 13.740000000 440 +13.740000000 14.940000000 466.164 +14.960000000 15.180000000 493.883 +16.720000000 18.040000000 587.33 +18.020000000 18.300000000 698.456 +18.280000000 18.620000000 622.254 +19.540000000 20.840000000 698.456 +20.800000000 20.920000000 783.991 +21.220000000 21.700000000 830.609 +21.660000000 22.180000000 783.991 +22.160000000 22.660000000 587.33 +22.660000000 23.100000000 698.456 +23.080000000 23.560000000 659.255 +24.080000000 25.020000000 622.254 +25.000000000 25.820000000 587.33 +26.020000000 26.280000000 622.254 +26.240000000 26.580000000 783.991 +26.540000000 26.800000000 622.254 +27.040000000 28.060000000 466.164 +28.000000000 28.300000000 587.33 +28.540000000 29.000000000 466.164 +29.060000000 29.540000000 293.665 +29.480000000 30.040000000 349.228 +29.980000000 30.540000000 466.164 +30.460000000 31.000000000 349.228 +31.000000000 31.560000000 466.164 +31.540000000 32.600000000 587.33
--- a/testdata/TRIOS-silvet/mozart/mix.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/mix.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,291 +1,166 @@ -1.640000000 1.720000000 116.541 -1.720000000 1.840000000 293.665 -2.280000000 2.600000000 233.082 -1.560000000 2.680000000 587.33 -2.000000000 2.880000000 293.665 -2.760000000 3.000000000 587.33 -2.760000000 3.080000000 233.082 -3.400000000 3.480000000 440 -3.360000000 3.480000000 1396.91 -3.000000000 3.520000000 698.456 -3.280000000 3.600000000 220 -3.440000000 4.000000000 622.254 -3.800000000 4.040000000 440 -3.800000000 4.080000000 220 -4.040000000 4.280000000 261.626 -4.280000000 4.480000000 220 -4.000000000 4.480000000 523.251 -4.520000000 4.680000000 146.832 -4.480000000 4.800000000 466.164 -5.040000000 5.120000000 466.164 -4.960000000 5.320000000 293.665 -4.680000000 5.600000000 233.082 -5.560000000 5.720000000 349.228 -5.600000000 5.760000000 466.164 -5.480000000 5.800000000 293.665 -5.680000000 5.960000000 233.082 -6.040000000 6.120000000 246.942 -6.120000000 6.240000000 493.883 -6.000000000 6.280000000 220 -6.200000000 6.480000000 261.626 -5.960000000 6.520000000 110 -6.560000000 6.640000000 349.228 -6.520000000 6.800000000 311.127 -6.720000000 7.040000000 261.626 -7.040000000 7.120000000 311.127 -6.960000000 7.160000000 349.228 -6.240000000 7.400000000 523.251 -7.200000000 7.440000000 261.626 -7.480000000 7.760000000 554.365 -7.520000000 7.840000000 116.541 -7.760000000 7.840000000 233.082 -8.000000000 8.080000000 116.541 -7.680000000 8.080000000 587.33 -7.960000000 8.320000000 293.665 -8.200000000 8.320000000 587.33 -8.200000000 8.560000000 233.082 -8.440000000 8.800000000 293.665 -8.520000000 8.880000000 587.33 -8.760000000 8.960000000 233.082 -9.000000000 9.320000000 698.456 -9.240000000 9.520000000 622.254 -9.240000000 9.600000000 220 -9.560000000 9.680000000 174.614 -8.880000000 9.840000000 87.3071 -9.760000000 10.000000000 440 -9.880000000 10.080000000 523.251 -9.720000000 10.120000000 220 -9.720000000 10.120000000 261.626 -10.080000000 10.200000000 349.228 -10.040000000 10.280000000 311.127 -10.240000000 10.400000000 440 -10.200000000 10.480000000 220 -10.280000000 10.480000000 261.626 -10.240000000 10.480000000 523.251 -10.400000000 10.480000000 830.609 -10.720000000 10.800000000 466.164 -10.560000000 10.920000000 116.541 -10.600000000 10.960000000 349.228 -10.800000000 11.000000000 233.082 -10.920000000 11.000000000 739.989 -10.640000000 11.040000000 1396.91 -11.160000000 11.240000000 1396.91 -10.480000000 11.280000000 698.456 -10.960000000 11.320000000 293.665 -11.120000000 11.440000000 349.228 -11.240000000 11.520000000 783.991 -11.200000000 11.600000000 233.082 +1.540000000 1.680000000 830.609 +1.520000000 1.800000000 587.33 +1.480000000 1.980000000 116.541 +1.560000000 2.020000000 233.082 +1.840000000 2.080000000 587.33 +2.000000000 2.300000000 293.665 +2.280000000 2.580000000 233.082 +2.480000000 2.820000000 293.665 +2.200000000 2.980000000 587.33 +2.760000000 3.060000000 233.082 +3.320000000 3.440000000 220 +3.000000000 3.500000000 698.456 +3.460000000 4.000000000 622.254 +4.000000000 4.460000000 523.251 +4.520000000 4.640000000 466.164 +4.720000000 4.960000000 233.082 +4.980000000 5.180000000 293.665 +5.200000000 5.520000000 233.082 +5.500000000 5.640000000 293.665 +6.240000000 6.640000000 523.251 +6.740000000 6.900000000 261.626 +7.000000000 7.260000000 523.251 +7.500000000 7.720000000 554.365 +7.980000000 8.200000000 293.665 +7.700000000 8.240000000 587.33 +8.200000000 8.500000000 233.082 +8.560000000 8.720000000 587.33 +8.460000000 8.760000000 293.665 +8.720000000 8.940000000 233.082 +9.000000000 9.280000000 698.456 +9.240000000 9.460000000 220 +9.260000000 9.460000000 622.254 +8.940000000 9.760000000 87.3071 +9.760000000 9.900000000 440 +9.760000000 10.000000000 220 +9.760000000 10.000000000 261.626 +9.880000000 10.040000000 523.251 +10.040000000 10.240000000 311.127 +10.240000000 10.380000000 220 +10.240000000 10.420000000 261.626 +10.260000000 10.440000000 523.251 +10.620000000 10.740000000 116.541 +10.740000000 10.940000000 233.082 +10.980000000 11.200000000 293.665 +10.480000000 11.240000000 698.456 +11.240000000 11.480000000 783.991 +11.220000000 11.520000000 233.082 +11.480000000 11.700000000 293.665 11.480000000 11.760000000 880 -11.440000000 11.800000000 293.665 -11.480000000 11.800000000 349.228 -11.840000000 11.920000000 987.767 -11.920000000 12.000000000 349.228 -11.680000000 12.040000000 233.082 -11.960000000 12.040000000 466.164 -11.760000000 12.040000000 932.328 -12.040000000 12.120000000 987.767 -12.040000000 12.240000000 349.228 -12.000000000 12.280000000 155.563 -12.080000000 12.280000000 932.328 -12.200000000 12.360000000 440 -11.960000000 12.440000000 311.127 -12.440000000 12.520000000 440 -12.280000000 12.520000000 880 -12.360000000 12.560000000 155.563 -12.240000000 12.600000000 220 -12.560000000 12.720000000 369.994 -12.520000000 12.760000000 261.626 -12.520000000 12.760000000 783.991 -12.760000000 12.880000000 440 -12.920000000 13.040000000 440 -12.680000000 13.040000000 698.456 -12.720000000 13.080000000 220 -12.280000000 13.200000000 349.228 -12.960000000 13.280000000 622.254 -13.320000000 13.400000000 349.228 -13.240000000 13.440000000 220 -13.280000000 13.440000000 523.251 -13.480000000 13.680000000 146.832 -13.520000000 13.720000000 440 -13.680000000 14.000000000 233.082 -13.880000000 14.160000000 466.164 -13.960000000 14.240000000 293.665 -14.160000000 14.560000000 233.082 -14.520000000 14.640000000 466.164 -13.720000000 14.720000000 349.228 -14.480000000 14.800000000 293.665 -14.720000000 14.800000000 369.994 -14.640000000 14.960000000 233.082 -14.800000000 15.120000000 349.228 -14.920000000 15.200000000 493.883 -15.080000000 15.400000000 220 -14.960000000 15.480000000 110 -15.200000000 15.480000000 261.626 -15.440000000 15.720000000 349.228 -15.680000000 16.000000000 261.626 -15.920000000 16.000000000 349.228 -16.080000000 16.280000000 349.228 -16.200000000 16.400000000 261.626 -15.440000000 16.400000000 311.127 -15.160000000 16.400000000 523.251 -16.520000000 16.640000000 233.082 -16.400000000 16.640000000 349.228 -16.440000000 16.760000000 554.365 -16.480000000 16.960000000 116.541 -17.000000000 17.120000000 116.541 -16.680000000 17.160000000 587.33 -16.880000000 17.280000000 293.665 -17.200000000 17.480000000 233.082 -16.760000000 17.720000000 349.228 -17.400000000 17.760000000 293.665 -17.720000000 17.840000000 369.994 -17.480000000 17.920000000 587.33 -17.680000000 17.960000000 233.082 -17.960000000 18.160000000 174.614 -17.960000000 18.240000000 698.456 -18.320000000 18.400000000 440 -17.840000000 18.440000000 349.228 -18.240000000 18.440000000 622.254 -18.200000000 18.520000000 220 -18.480000000 18.560000000 440 -18.520000000 18.640000000 523.251 -18.520000000 18.720000000 261.626 -18.560000000 18.760000000 311.127 -18.680000000 18.960000000 440 -18.680000000 19.000000000 220 -18.760000000 19.120000000 523.251 -18.920000000 19.400000000 155.563 +11.760000000 11.960000000 233.082 +11.740000000 12.100000000 932.328 +12.140000000 12.260000000 932.328 +12.000000000 12.300000000 311.127 +12.300000000 12.460000000 220 +12.260000000 12.500000000 880 +12.500000000 12.720000000 783.991 +12.640000000 12.760000000 349.228 +12.720000000 13.000000000 698.456 +12.860000000 13.020000000 220 +12.980000000 13.260000000 622.254 +13.780000000 13.940000000 233.082 +14.200000000 14.500000000 233.082 +14.940000000 15.140000000 493.883 +15.240000000 15.360000000 261.626 +15.160000000 15.420000000 523.251 +15.460000000 15.620000000 523.251 +15.460000000 15.780000000 311.127 +15.720000000 15.920000000 261.626 +15.960000000 16.180000000 523.251 +15.940000000 16.320000000 311.127 +16.220000000 16.340000000 261.626 +16.520000000 16.640000000 116.541 +16.520000000 16.700000000 554.365 +16.700000000 16.820000000 233.082 +16.700000000 16.960000000 587.33 +17.000000000 17.180000000 587.33 +16.920000000 17.220000000 293.665 +17.200000000 17.440000000 233.082 +17.340000000 17.460000000 349.228 +17.520000000 17.640000000 349.228 +17.440000000 17.700000000 293.665 +17.480000000 17.840000000 587.33 +17.700000000 17.920000000 233.082 +17.840000000 17.960000000 349.228 +18.080000000 18.240000000 174.614 +18.100000000 18.240000000 698.456 +18.260000000 18.380000000 622.254 +18.040000000 18.420000000 349.228 +18.600000000 18.720000000 311.127 +18.780000000 18.920000000 440 +18.800000000 19.080000000 261.626 +18.920000000 19.080000000 523.251 +18.980000000 19.300000000 311.127 19.200000000 19.400000000 220 -18.800000000 19.440000000 261.626 -18.960000000 19.440000000 311.127 -19.320000000 19.480000000 523.251 -19.480000000 19.680000000 440 -19.640000000 19.880000000 1396.91 -19.400000000 20.000000000 146.832 -20.000000000 20.080000000 1396.91 -19.920000000 20.160000000 293.665 -20.120000000 20.200000000 466.164 -20.160000000 20.240000000 146.832 -20.240000000 20.320000000 293.665 -20.360000000 20.480000000 466.164 -20.440000000 20.520000000 1396.91 -20.560000000 20.640000000 349.228 -20.440000000 20.760000000 293.665 -20.680000000 20.760000000 466.164 -19.480000000 20.760000000 698.456 -20.800000000 20.880000000 783.991 -20.880000000 20.960000000 698.456 -19.560000000 21.040000000 233.082 -20.920000000 21.040000000 659.255 -21.000000000 21.080000000 246.942 -21.120000000 21.200000000 293.665 -21.040000000 21.200000000 698.456 -21.080000000 21.200000000 739.989 -21.280000000 21.440000000 493.883 -21.320000000 21.560000000 739.989 -21.120000000 21.680000000 830.609 -21.680000000 21.760000000 349.228 -21.520000000 21.880000000 293.665 -20.880000000 21.920000000 97.9989 -21.920000000 22.000000000 739.989 -21.200000000 22.040000000 246.942 -21.960000000 22.080000000 391.995 -21.960000000 22.080000000 493.883 +19.300000000 19.420000000 261.626 +19.480000000 19.600000000 146.832 +19.560000000 19.680000000 1396.91 +19.960000000 20.080000000 293.665 +19.600000000 20.180000000 233.082 +20.200000000 20.320000000 233.082 +20.480000000 20.640000000 293.665 +19.500000000 20.780000000 698.456 +20.700000000 20.980000000 233.082 +21.020000000 21.140000000 698.456 +21.000000000 21.460000000 97.9989 +21.240000000 21.560000000 246.942 +21.120000000 21.660000000 830.609 +21.540000000 21.740000000 293.665 +21.760000000 21.980000000 246.942 21.640000000 22.120000000 783.991 -22.080000000 22.160000000 739.989 -22.200000000 22.280000000 493.883 -22.000000000 22.360000000 293.665 -22.040000000 22.360000000 349.228 -22.080000000 22.400000000 246.942 -22.400000000 22.480000000 261.626 -22.400000000 22.480000000 493.883 -22.160000000 22.600000000 587.33 -22.600000000 22.800000000 261.626 -22.840000000 23.000000000 261.626 -22.600000000 23.040000000 698.456 -22.760000000 23.120000000 233.082 -22.600000000 23.240000000 523.251 -23.000000000 23.320000000 391.995 -23.320000000 23.400000000 261.626 -23.040000000 23.440000000 659.255 -23.440000000 23.520000000 698.456 -23.440000000 23.560000000 311.127 -23.520000000 23.600000000 261.626 -23.240000000 23.640000000 233.082 -22.440000000 23.720000000 130.813 -23.720000000 23.840000000 261.626 -23.160000000 23.840000000 329.628 -23.600000000 23.920000000 391.995 -23.880000000 23.960000000 415.305 -23.720000000 24.040000000 233.082 -23.560000000 24.160000000 523.251 -24.120000000 24.240000000 261.626 -24.240000000 24.600000000 220 -24.080000000 24.600000000 622.254 -24.600000000 24.760000000 261.626 -23.880000000 24.960000000 92.4986 -23.960000000 24.960000000 311.127 -24.200000000 25.000000000 440 -24.720000000 25.000000000 622.254 -24.760000000 25.040000000 220 -25.000000000 25.120000000 466.164 -25.000000000 25.120000000 587.33 -24.960000000 25.280000000 293.665 -25.040000000 25.320000000 233.082 -25.200000000 25.520000000 466.164 -24.960000000 25.560000000 97.9989 -25.280000000 25.720000000 195.998 -25.240000000 25.760000000 587.33 -25.720000000 25.800000000 1174.66 -25.760000000 26.000000000 523.251 -25.480000000 26.160000000 155.563 -26.200000000 26.280000000 155.563 -25.560000000 26.280000000 391.995 -26.000000000 26.280000000 622.254 -26.320000000 26.400000000 77.7817 -26.240000000 26.560000000 783.991 -26.400000000 26.760000000 391.995 -26.560000000 26.840000000 622.254 -25.520000000 27.000000000 311.127 -26.760000000 27.120000000 523.251 -26.480000000 27.160000000 155.563 -27.080000000 27.160000000 349.228 -27.160000000 27.280000000 523.251 -27.240000000 27.320000000 349.228 -27.120000000 27.320000000 466.164 -27.120000000 27.520000000 293.665 -27.520000000 27.760000000 349.228 -27.520000000 27.760000000 523.251 -26.960000000 27.880000000 174.614 -27.840000000 27.960000000 293.665 -27.480000000 28.000000000 466.164 -28.040000000 28.200000000 349.228 -28.000000000 28.240000000 174.614 -27.960000000 28.280000000 587.33 -28.240000000 28.520000000 311.127 -28.240000000 28.520000000 523.251 -28.560000000 28.680000000 233.082 -28.520000000 28.720000000 116.541 -28.600000000 28.920000000 466.164 -29.000000000 29.600000000 233.082 -29.480000000 30.000000000 349.228 -29.920000000 30.120000000 174.614 -28.560000000 30.160000000 293.665 -30.080000000 30.400000000 146.832 -30.000000000 30.440000000 466.164 -30.400000000 30.480000000 233.082 -30.560000000 30.960000000 174.614 -30.600000000 31.000000000 293.665 -31.040000000 31.160000000 174.614 -31.040000000 31.320000000 146.832 -30.040000000 31.520000000 349.228 -31.080000000 31.600000000 466.164 -31.600000000 31.720000000 116.541 -31.720000000 32.160000000 466.164 -31.480000000 32.280000000 587.33 -35.840000000 35.920000000 739.989 -35.840000000 35.920000000 1396.91 -36.080000000 36.160000000 739.989 -36.080000000 36.160000000 1396.91 -36.200000000 36.280000000 65.4064 -36.200000000 36.320000000 123.471 +22.040000000 22.340000000 293.665 +22.260000000 22.380000000 246.942 +22.300000000 22.600000000 587.33 +22.560000000 22.940000000 130.813 +22.840000000 22.980000000 261.626 +22.760000000 22.980000000 523.251 +22.620000000 23.040000000 698.456 +22.780000000 23.080000000 233.082 +23.060000000 23.180000000 261.626 +23.040000000 23.240000000 391.995 +23.140000000 23.340000000 329.628 +23.300000000 23.500000000 233.082 +23.080000000 23.500000000 659.255 +23.380000000 23.780000000 329.628 +23.740000000 23.860000000 523.251 +23.760000000 23.980000000 233.082 +23.880000000 24.000000000 523.251 +24.020000000 24.240000000 92.4986 +24.000000000 24.340000000 311.127 +24.240000000 24.500000000 440 +24.220000000 24.540000000 622.254 +24.360000000 24.560000000 220 +24.480000000 24.960000000 311.127 +24.820000000 24.960000000 440 +24.860000000 25.020000000 622.254 +25.060000000 25.200000000 233.082 +24.980000000 25.240000000 293.665 +25.040000000 25.420000000 97.9989 +25.200000000 25.460000000 466.164 +25.200000000 25.560000000 587.33 +25.520000000 25.640000000 155.563 +25.480000000 25.660000000 195.998 +25.580000000 25.720000000 391.995 +25.660000000 25.800000000 155.563 +26.120000000 26.240000000 622.254 +25.540000000 26.260000000 311.127 +26.240000000 26.500000000 783.991 +26.640000000 26.760000000 622.254 +26.500000000 26.780000000 311.127 +28.020000000 28.240000000 587.33 +28.300000000 28.480000000 523.251 +28.700000000 28.920000000 293.665 +28.780000000 28.920000000 466.164 +29.200000000 29.460000000 293.665 +29.060000000 29.480000000 233.082 +29.500000000 29.620000000 349.228 +29.660000000 29.920000000 349.228 +29.820000000 29.980000000 293.665 +30.260000000 30.440000000 349.228 +30.160000000 30.440000000 466.164 +30.700000000 30.940000000 174.614 +30.580000000 30.960000000 293.665 +31.100000000 31.440000000 466.164 +30.720000000 31.480000000 349.228 +31.700000000 32.120000000 466.164 +31.480000000 32.200000000 587.33
--- a/testdata/TRIOS-silvet/mozart/piano.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/piano.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,178 +1,150 @@ -1.560000000 1.880000000 116.541 -1.840000000 2.000000000 233.082 -2.040000000 2.360000000 293.665 -2.240000000 2.640000000 233.082 -2.480000000 2.880000000 293.665 -2.840000000 2.960000000 466.164 -2.680000000 3.120000000 233.082 -3.400000000 3.480000000 440 -3.280000000 3.640000000 220 +1.540000000 1.760000000 587.33 +1.540000000 1.840000000 830.609 +1.560000000 2.260000000 233.082 +1.460000000 2.340000000 116.541 +2.080000000 2.340000000 349.228 +2.000000000 2.380000000 293.665 +2.300000000 2.700000000 233.082 +2.580000000 2.760000000 349.228 +2.460000000 2.920000000 293.665 +2.740000000 3.120000000 233.082 +3.180000000 3.300000000 174.614 +3.260000000 3.600000000 220 +3.280000000 3.600000000 440 3.760000000 4.080000000 220 -3.800000000 4.080000000 440 -4.000000000 4.320000000 261.626 -4.280000000 4.480000000 220 -4.480000000 4.760000000 146.832 -4.720000000 5.040000000 233.082 -5.040000000 5.200000000 349.228 -4.960000000 5.320000000 293.665 -5.160000000 5.600000000 233.082 -5.520000000 5.720000000 349.228 -5.440000000 5.800000000 293.665 -5.680000000 5.960000000 233.082 -6.000000000 6.280000000 220 -6.200000000 6.560000000 261.626 -5.960000000 6.640000000 110 -6.480000000 6.680000000 349.228 -6.480000000 6.800000000 311.127 -6.760000000 6.880000000 523.251 -6.680000000 7.040000000 261.626 -7.000000000 7.200000000 311.127 -6.960000000 7.200000000 349.228 -7.200000000 7.440000000 261.626 -7.720000000 7.960000000 233.082 -7.520000000 8.080000000 116.541 -7.960000000 8.320000000 293.665 -8.200000000 8.560000000 233.082 -8.440000000 8.760000000 293.665 -8.760000000 9.000000000 233.082 -9.240000000 9.600000000 220 -9.560000000 9.720000000 174.614 -8.880000000 9.880000000 87.3071 -9.720000000 10.000000000 440 -9.720000000 10.120000000 220 -10.000000000 10.280000000 349.228 -10.240000000 10.400000000 440 -10.200000000 10.480000000 220 -10.720000000 10.800000000 466.164 -10.480000000 11.000000000 116.541 -10.720000000 11.040000000 233.082 -10.960000000 11.320000000 293.665 -11.520000000 11.720000000 349.228 -11.440000000 11.800000000 293.665 -11.160000000 12.080000000 233.082 -12.000000000 12.480000000 311.127 -12.200000000 12.520000000 440 -11.960000000 12.600000000 155.563 -12.240000000 12.600000000 220 -12.480000000 12.680000000 349.228 -12.480000000 12.680000000 523.251 -12.520000000 12.800000000 261.626 -12.720000000 12.880000000 440 -12.920000000 13.040000000 440 -12.720000000 13.120000000 220 -13.040000000 13.160000000 349.228 -13.200000000 13.480000000 220 -13.440000000 13.760000000 146.832 -13.720000000 14.040000000 233.082 -13.960000000 14.280000000 293.665 -14.200000000 14.560000000 233.082 -14.480000000 14.800000000 293.665 -14.760000000 15.000000000 233.082 -15.240000000 15.320000000 523.251 -15.080000000 15.400000000 220 -15.200000000 15.560000000 261.626 -14.920000000 15.600000000 110 -15.480000000 15.680000000 349.228 -15.680000000 16.000000000 523.251 -15.680000000 16.040000000 261.626 -16.000000000 16.200000000 349.228 -16.200000000 16.360000000 523.251 -15.440000000 16.400000000 311.127 -16.160000000 16.440000000 261.626 -16.520000000 16.920000000 233.082 -16.440000000 17.160000000 116.541 -16.920000000 17.240000000 293.665 -17.160000000 17.560000000 233.082 -17.440000000 17.760000000 293.665 -17.640000000 17.960000000 233.082 -17.960000000 18.160000000 174.614 -18.120000000 18.280000000 349.228 -18.320000000 18.400000000 440 -18.280000000 18.480000000 174.614 -18.480000000 18.560000000 440 -18.200000000 18.600000000 220 -18.520000000 18.640000000 523.251 -18.480000000 18.760000000 261.626 -18.640000000 18.960000000 440 -18.680000000 19.000000000 220 -18.960000000 19.040000000 523.251 -19.000000000 19.160000000 349.228 -18.920000000 19.280000000 261.626 -19.160000000 19.400000000 220 -18.960000000 19.440000000 311.127 -18.920000000 19.520000000 155.563 -19.440000000 19.840000000 440 -19.400000000 20.000000000 146.832 -19.640000000 20.080000000 233.082 -20.000000000 20.200000000 349.228 -20.120000000 20.240000000 146.832 -19.920000000 20.360000000 293.665 -20.160000000 20.520000000 233.082 -20.560000000 20.680000000 349.228 -20.440000000 20.800000000 293.665 -20.680000000 21.040000000 233.082 -21.080000000 21.280000000 293.665 -21.040000000 21.320000000 698.456 -21.280000000 21.360000000 739.989 -21.240000000 21.440000000 493.883 -21.320000000 21.640000000 246.942 -21.560000000 21.800000000 349.228 -21.480000000 21.920000000 293.665 -21.760000000 21.960000000 246.942 -20.880000000 22.040000000 97.9989 -22.000000000 22.360000000 293.665 -22.040000000 22.360000000 349.228 -22.320000000 22.480000000 246.942 -22.560000000 22.640000000 261.626 -22.600000000 22.720000000 659.255 -22.800000000 22.960000000 466.164 -22.720000000 23.160000000 233.082 -23.040000000 23.280000000 523.251 -23.120000000 23.400000000 261.626 -23.000000000 23.400000000 391.995 -23.440000000 23.560000000 311.127 -23.240000000 23.640000000 233.082 -22.440000000 23.720000000 130.813 -23.520000000 23.760000000 523.251 -23.560000000 23.840000000 261.626 -23.480000000 23.840000000 329.628 -23.720000000 24.040000000 233.082 -24.040000000 24.240000000 523.251 -24.120000000 24.280000000 261.626 -24.200000000 24.600000000 220 -24.240000000 24.640000000 440 -24.600000000 24.800000000 261.626 -24.760000000 24.960000000 440 -23.880000000 25.000000000 92.4986 -23.960000000 25.000000000 311.127 -24.720000000 25.040000000 220 -25.040000000 25.360000000 233.082 -25.000000000 25.360000000 293.665 -24.920000000 25.640000000 97.9989 -25.680000000 25.760000000 77.7817 -25.280000000 25.760000000 195.998 -25.760000000 25.840000000 233.082 -25.400000000 26.000000000 391.995 -25.480000000 26.160000000 155.563 -26.200000000 26.320000000 155.563 -25.480000000 26.360000000 311.127 -25.840000000 26.480000000 77.7817 -26.440000000 27.120000000 311.127 -26.480000000 27.160000000 155.563 -27.080000000 27.160000000 349.228 -27.000000000 27.280000000 523.251 -27.520000000 27.720000000 349.228 -27.520000000 27.800000000 523.251 -26.960000000 28.320000000 174.614 -28.480000000 29.160000000 116.541 -29.040000000 29.840000000 233.082 -29.600000000 30.200000000 174.614 +3.740000000 4.120000000 440 +4.040000000 4.180000000 349.228 +4.000000000 4.300000000 261.626 +4.220000000 4.380000000 440 +4.260000000 4.460000000 220 +4.500000000 4.760000000 146.832 +4.720000000 5.020000000 233.082 +4.980000000 5.180000000 349.228 +4.960000000 5.300000000 293.665 +5.180000000 5.560000000 233.082 +5.500000000 5.700000000 349.228 +5.460000000 5.800000000 293.665 +5.700000000 5.960000000 233.082 +5.940000000 6.520000000 110 +6.200000000 6.540000000 261.626 +6.480000000 6.700000000 349.228 +6.500000000 6.780000000 311.127 +6.700000000 7.080000000 261.626 +7.000000000 7.180000000 311.127 +6.960000000 7.260000000 349.228 +7.200000000 7.420000000 261.626 +7.520000000 7.780000000 116.541 +7.540000000 7.980000000 233.082 +7.980000000 8.280000000 293.665 +8.180000000 8.580000000 233.082 +8.460000000 8.760000000 293.665 +8.720000000 8.980000000 233.082 +9.240000000 9.420000000 440 +9.240000000 9.580000000 220 +8.920000000 9.840000000 87.3071 +9.760000000 9.880000000 440 +9.720000000 10.080000000 220 +10.000000000 10.240000000 349.228 +10.280000000 10.420000000 440 +10.200000000 10.440000000 220 +10.560000000 10.880000000 116.541 +10.520000000 11.020000000 233.082 +10.960000000 11.300000000 293.665 +11.180000000 11.600000000 233.082 +11.520000000 11.700000000 349.228 +11.460000000 11.780000000 293.665 +11.700000000 12.040000000 233.082 +11.960000000 12.400000000 155.563 +11.980000000 12.440000000 311.127 +12.320000000 12.460000000 440 +12.220000000 12.540000000 220 +12.480000000 12.640000000 523.251 +12.500000000 12.720000000 349.228 +12.500000000 12.740000000 261.626 +12.720000000 12.900000000 440 +12.700000000 13.080000000 220 +13.240000000 13.440000000 220 +13.540000000 13.660000000 146.832 +13.720000000 13.960000000 233.082 +13.980000000 14.220000000 293.665 +14.200000000 14.540000000 233.082 +14.480000000 14.760000000 293.665 +14.740000000 14.940000000 233.082 +15.240000000 15.360000000 220 +14.960000000 15.440000000 110 +15.200000000 15.480000000 261.626 +15.520000000 15.640000000 349.228 +15.440000000 15.820000000 311.127 +15.680000000 15.980000000 261.626 +15.980000000 16.140000000 349.228 +15.920000000 16.360000000 311.127 +16.200000000 16.380000000 261.626 +16.480000000 16.620000000 233.082 +16.540000000 16.700000000 116.541 +16.680000000 16.940000000 233.082 +16.940000000 17.220000000 293.665 +17.180000000 17.500000000 233.082 +17.460000000 17.700000000 293.665 +17.680000000 17.940000000 233.082 +17.980000000 18.100000000 174.614 +18.300000000 18.420000000 440 +18.220000000 18.520000000 220 +18.500000000 18.680000000 261.626 +18.680000000 18.860000000 440 +18.680000000 18.980000000 220 +18.960000000 19.160000000 261.626 +18.940000000 19.260000000 155.563 +19.180000000 19.400000000 220 +18.960000000 19.420000000 311.127 +19.480000000 19.660000000 440 +19.420000000 19.800000000 146.832 +19.660000000 20.020000000 233.082 +19.960000000 20.160000000 293.665 +20.180000000 20.320000000 293.665 +20.180000000 20.520000000 233.082 +20.460000000 20.760000000 293.665 +20.720000000 21.000000000 233.082 +21.260000000 21.480000000 246.942 +21.540000000 21.780000000 293.665 +20.940000000 21.880000000 97.9989 +21.760000000 22.020000000 246.942 +21.920000000 22.040000000 97.9989 +22.040000000 22.280000000 349.228 +22.020000000 22.340000000 293.665 +22.740000000 23.120000000 233.082 +23.140000000 23.280000000 261.626 +23.020000000 23.300000000 391.995 +22.480000000 23.460000000 130.813 +23.260000000 23.600000000 233.082 +23.460000000 23.800000000 329.628 +23.560000000 23.820000000 261.626 +23.740000000 24.040000000 233.082 +23.980000000 24.340000000 311.127 +24.240000000 24.500000000 440 +23.960000000 24.560000000 92.4986 +24.280000000 24.600000000 220 +24.780000000 24.900000000 440 +24.480000000 24.920000000 311.127 +24.820000000 25.000000000 220 +25.000000000 25.280000000 293.665 +25.040000000 25.300000000 233.082 +25.020000000 25.560000000 97.9989 +25.320000000 25.640000000 195.998 +25.640000000 25.780000000 155.563 +25.600000000 25.900000000 391.995 +25.620000000 26.060000000 77.7817 +25.500000000 26.280000000 311.127 +26.520000000 26.740000000 311.127 +27.640000000 27.760000000 174.614 +28.060000000 28.220000000 174.614 +29.060000000 29.380000000 233.082 +29.400000000 29.580000000 233.082 +29.660000000 29.780000000 174.614 30.120000000 30.240000000 440 -30.040000000 30.600000000 146.832 -31.080000000 31.200000000 440 -30.560000000 31.240000000 174.614 -31.000000000 31.600000000 146.832 -31.680000000 31.920000000 116.541 -36.000000000 36.080000000 1661.22 -36.000000000 36.120000000 783.991 -36.000000000 36.120000000 1396.91 +30.060000000 30.480000000 146.832 +30.540000000 30.940000000 174.614 +31.000000000 31.220000000 174.614 +31.060000000 31.340000000 440 +31.020000000 31.620000000 146.832 +31.640000000 31.800000000 233.082 +31.620000000 32.360000000 116.541
--- a/testdata/TRIOS-silvet/mozart/piano_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/piano_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,241 +1,136 @@ -1.560000000 1.680000000 587.33 -1.600000000 1.720000000 349.228 -1.680000000 1.800000000 293.665 -1.840000000 1.920000000 466.164 -1.800000000 1.960000000 587.33 -1.560000000 2.040000000 830.609 -2.040000000 2.120000000 369.994 -2.080000000 2.440000000 293.665 -1.400000000 2.480000000 116.541 -2.400000000 2.520000000 466.164 -2.480000000 2.600000000 369.994 -2.560000000 2.920000000 293.665 -2.880000000 2.960000000 116.541 -2.840000000 2.960000000 466.164 -3.040000000 3.120000000 466.164 -1.800000000 3.240000000 233.082 -3.240000000 3.480000000 440 -3.000000000 3.560000000 174.614 -3.520000000 3.600000000 369.994 -3.560000000 3.680000000 440 -3.600000000 3.880000000 523.251 -3.840000000 3.960000000 174.614 -4.000000000 4.080000000 523.251 -4.080000000 4.160000000 174.614 -3.880000000 4.400000000 440 -4.160000000 4.400000000 523.251 -3.520000000 4.440000000 261.626 -1.920000000 4.440000000 349.228 -4.520000000 4.600000000 440 -3.240000000 4.640000000 220 -4.680000000 4.880000000 440 -4.760000000 4.880000000 466.164 -4.920000000 5.000000000 116.541 -5.000000000 5.120000000 293.665 -5.080000000 5.200000000 880 -4.440000000 5.280000000 146.832 -5.240000000 5.320000000 293.665 -5.280000000 5.400000000 466.164 -5.440000000 5.520000000 369.994 -5.600000000 5.680000000 116.541 -5.480000000 5.880000000 293.665 -4.920000000 5.920000000 349.228 -6.000000000 6.080000000 220 -4.680000000 6.120000000 233.082 -6.040000000 6.120000000 783.991 -6.240000000 6.400000000 1046.5 -6.320000000 6.440000000 329.628 -6.200000000 6.560000000 523.251 -5.840000000 6.880000000 110 -6.760000000 7.000000000 523.251 -7.040000000 7.120000000 174.614 -6.480000000 7.400000000 311.127 -6.400000000 7.400000000 349.228 -7.200000000 7.520000000 523.251 -6.200000000 7.560000000 261.626 -7.520000000 7.920000000 587.33 -7.480000000 7.960000000 830.609 -7.840000000 8.000000000 466.164 -7.960000000 8.040000000 369.994 -7.320000000 8.360000000 116.541 -8.000000000 8.360000000 293.665 -8.360000000 8.440000000 466.164 -8.440000000 8.520000000 369.994 -8.520000000 8.640000000 587.33 -8.480000000 8.800000000 293.665 -7.920000000 8.880000000 349.228 -7.680000000 9.160000000 233.082 -9.280000000 9.480000000 440 -9.560000000 9.720000000 523.251 -9.520000000 9.800000000 261.626 -9.720000000 9.840000000 440 -8.880000000 10.000000000 87.3071 -9.920000000 10.040000000 440 -10.080000000 10.360000000 440 -10.000000000 10.360000000 523.251 -10.000000000 10.400000000 261.626 -9.480000000 10.400000000 349.228 -10.520000000 10.600000000 349.228 -9.160000000 10.640000000 220 -10.720000000 10.800000000 466.164 -10.520000000 10.800000000 587.33 -10.840000000 10.960000000 587.33 -10.480000000 10.960000000 830.609 -11.000000000 11.360000000 293.665 -10.360000000 11.400000000 116.541 -11.440000000 11.560000000 369.994 -11.480000000 11.840000000 293.665 -10.920000000 11.920000000 349.228 -11.960000000 12.080000000 466.164 -10.760000000 12.240000000 233.082 -12.200000000 12.280000000 440 -12.240000000 12.440000000 466.164 -12.440000000 12.520000000 440 -12.480000000 12.680000000 523.251 -11.920000000 12.760000000 155.563 -12.680000000 12.800000000 440 -12.760000000 12.840000000 523.251 -12.520000000 12.880000000 261.626 -12.960000000 13.120000000 440 -12.960000000 13.400000000 261.626 -12.440000000 13.400000000 349.228 -13.000000000 13.400000000 523.251 -13.240000000 13.520000000 440 -12.160000000 13.680000000 220 -13.640000000 13.760000000 440 -13.920000000 14.000000000 466.164 -13.960000000 14.040000000 369.994 -14.000000000 14.280000000 293.665 -13.400000000 14.360000000 146.832 -14.480000000 14.560000000 369.994 -14.720000000 14.800000000 116.541 -14.520000000 14.880000000 293.665 -14.720000000 14.880000000 466.164 -13.960000000 14.920000000 349.228 -13.680000000 15.120000000 233.082 -15.200000000 15.320000000 523.251 -15.240000000 15.320000000 1046.5 -15.200000000 15.360000000 329.628 -15.400000000 15.520000000 523.251 -15.520000000 15.640000000 698.456 -14.800000000 15.840000000 110 -15.480000000 15.840000000 311.127 -15.680000000 16.040000000 523.251 -15.400000000 16.360000000 349.228 -15.960000000 16.400000000 311.127 -16.160000000 16.440000000 523.251 -15.200000000 16.520000000 261.626 -16.440000000 16.600000000 349.228 -16.440000000 16.760000000 587.33 -16.680000000 16.800000000 466.164 -16.440000000 16.960000000 830.609 -16.920000000 17.000000000 369.994 -16.720000000 17.080000000 233.082 -17.000000000 17.080000000 587.33 -16.960000000 17.280000000 293.665 -16.880000000 17.320000000 349.228 -17.240000000 17.320000000 466.164 -16.280000000 17.360000000 116.541 -17.440000000 17.520000000 369.994 -17.480000000 17.800000000 293.665 -17.400000000 17.800000000 349.228 -17.120000000 18.120000000 233.082 -18.040000000 18.160000000 1244.51 -17.960000000 18.200000000 174.614 -18.280000000 18.480000000 174.614 -18.480000000 18.560000000 440 -18.440000000 18.640000000 523.251 -18.600000000 18.720000000 174.614 -18.720000000 18.840000000 523.251 -18.640000000 18.960000000 440 -18.960000000 19.320000000 523.251 -18.480000000 19.400000000 261.626 -17.960000000 19.400000000 349.228 -18.840000000 19.600000000 155.563 -18.160000000 19.600000000 220 -19.320000000 19.880000000 440 -19.920000000 20.000000000 369.994 -20.000000000 20.240000000 293.665 -20.440000000 20.520000000 369.994 -19.400000000 20.760000000 146.832 -20.520000000 20.840000000 293.665 -19.920000000 20.920000000 349.228 -19.640000000 21.160000000 233.082 -21.280000000 21.360000000 1244.51 -21.240000000 21.480000000 493.883 -21.000000000 21.520000000 293.665 -21.480000000 21.560000000 369.994 -21.600000000 21.680000000 493.883 -21.560000000 21.760000000 880 -20.880000000 22.080000000 97.9989 -21.800000000 22.120000000 493.883 -22.120000000 22.240000000 97.9989 -22.040000000 22.360000000 293.665 -21.480000000 22.440000000 349.228 -22.280000000 22.520000000 493.883 -21.200000000 22.640000000 246.942 -22.800000000 22.960000000 466.164 -22.600000000 23.120000000 130.813 -23.040000000 23.440000000 523.251 -23.160000000 23.480000000 130.813 -22.480000000 23.600000000 391.995 -23.600000000 23.680000000 130.813 -23.680000000 23.760000000 391.995 -23.760000000 23.880000000 1174.66 -22.840000000 23.920000000 261.626 -23.480000000 23.920000000 329.628 -23.520000000 23.920000000 523.251 -22.720000000 24.160000000 233.082 -24.040000000 24.400000000 261.626 -24.040000000 24.400000000 523.251 -24.400000000 24.520000000 440 -24.480000000 24.640000000 523.251 -23.960000000 24.800000000 92.4986 -24.680000000 24.840000000 523.251 -24.800000000 24.880000000 440 -24.520000000 24.920000000 261.626 -24.040000000 24.960000000 311.127 -24.840000000 25.080000000 92.4986 -24.200000000 25.200000000 220 -25.160000000 25.280000000 195.998 -25.040000000 25.400000000 233.082 -25.320000000 25.480000000 195.998 -25.000000000 25.560000000 293.665 -24.960000000 25.720000000 97.9989 -25.600000000 25.720000000 155.563 -25.520000000 25.840000000 311.127 -25.240000000 25.840000000 391.995 -25.400000000 26.520000000 77.7817 -26.520000000 26.760000000 311.127 -26.480000000 26.840000000 466.164 -26.440000000 27.320000000 155.563 -27.520000000 27.720000000 1244.51 -28.000000000 28.320000000 1244.51 -26.960000000 28.400000000 349.228 -26.960000000 28.440000000 174.614 -28.520000000 29.080000000 587.33 -29.080000000 29.160000000 1174.66 -29.160000000 29.280000000 587.33 -28.520000000 29.320000000 349.228 -28.520000000 29.320000000 830.609 -28.320000000 29.440000000 116.541 -29.600000000 29.840000000 1244.51 -29.040000000 30.040000000 233.082 -29.560000000 30.320000000 349.228 -29.520000000 30.360000000 174.614 -30.080000000 30.520000000 440 -30.560000000 30.760000000 1244.51 -30.000000000 30.880000000 146.832 -30.520000000 31.240000000 174.614 -30.520000000 31.320000000 349.228 -31.040000000 31.400000000 440 -31.640000000 31.720000000 587.33 -31.720000000 31.800000000 293.665 -31.680000000 31.840000000 349.228 -30.960000000 31.960000000 146.832 -31.640000000 32.160000000 830.609 -31.480000000 32.600000000 116.541 -35.920000000 36.040000000 277.183 -35.920000000 36.040000000 493.883 -36.160000000 36.280000000 123.471 -36.160000000 36.320000000 164.814 +1.520000000 1.920000000 587.33 +1.520000000 2.060000000 830.609 +2.080000000 2.400000000 293.665 +1.320000000 2.420000000 116.541 +2.040000000 2.420000000 349.228 +2.560000000 2.720000000 293.665 +2.760000000 2.880000000 293.665 +2.500000000 2.920000000 349.228 +1.780000000 3.200000000 233.082 +3.100000000 3.380000000 174.614 +3.400000000 3.520000000 174.614 +3.560000000 3.700000000 174.614 +3.500000000 3.820000000 349.228 +3.560000000 3.880000000 261.626 +3.980000000 4.120000000 440 +4.000000000 4.300000000 261.626 +3.960000000 4.360000000 349.228 +3.260000000 4.580000000 220 +4.500000000 5.000000000 146.832 +4.940000000 5.320000000 349.228 +5.500000000 5.800000000 349.228 +4.720000000 6.020000000 233.082 +6.200000000 6.500000000 261.626 +6.540000000 6.680000000 311.127 +5.940000000 6.700000000 110 +6.440000000 6.840000000 349.228 +6.720000000 6.940000000 261.626 +7.020000000 7.180000000 311.127 +6.940000000 7.340000000 349.228 +7.200000000 7.500000000 261.626 +7.720000000 7.940000000 233.082 +8.000000000 8.180000000 233.082 +7.460000000 8.220000000 116.541 +8.000000000 8.260000000 349.228 +8.200000000 8.640000000 233.082 +8.460000000 8.800000000 349.228 +8.720000000 9.040000000 233.082 +9.540000000 9.680000000 261.626 +9.000000000 9.820000000 87.3071 +9.480000000 9.820000000 349.228 +10.020000000 10.200000000 261.626 +9.980000000 10.340000000 349.228 +9.200000000 10.520000000 220 +10.720000000 11.020000000 233.082 +10.980000000 11.140000000 349.228 +10.460000000 11.200000000 116.541 +11.180000000 11.640000000 233.082 +11.460000000 11.800000000 349.228 +11.700000000 12.180000000 233.082 +12.040000000 12.320000000 155.563 +12.180000000 12.700000000 220 +12.500000000 12.700000000 261.626 +12.460000000 12.820000000 349.228 +13.020000000 13.200000000 261.626 +12.960000000 13.300000000 349.228 +12.740000000 13.600000000 220 +13.500000000 13.960000000 146.832 +13.700000000 14.120000000 233.082 +14.000000000 14.120000000 349.228 +14.160000000 14.320000000 349.228 +14.520000000 14.640000000 293.665 +14.480000000 14.840000000 349.228 +14.800000000 14.920000000 466.164 +14.200000000 15.020000000 233.082 +15.200000000 15.460000000 261.626 +15.500000000 15.680000000 311.127 +14.940000000 15.720000000 110 +15.440000000 15.760000000 349.228 +15.720000000 15.940000000 261.626 +15.980000000 16.200000000 311.127 +15.920000000 16.260000000 349.228 +16.200000000 16.440000000 261.626 +16.680000000 17.040000000 233.082 +16.400000000 17.220000000 116.541 +16.960000000 17.220000000 349.228 +17.180000000 17.600000000 233.082 +17.440000000 17.780000000 349.228 +17.660000000 18.000000000 233.082 +18.000000000 18.160000000 174.614 +18.200000000 18.320000000 174.614 +18.340000000 18.460000000 174.614 +18.440000000 18.680000000 349.228 +18.480000000 18.700000000 261.626 +18.960000000 19.160000000 261.626 +18.940000000 19.300000000 349.228 +18.200000000 19.520000000 220 +19.460000000 19.980000000 146.832 +19.660000000 20.120000000 233.082 +19.940000000 20.340000000 349.228 +20.180000000 20.580000000 233.082 +20.480000000 20.820000000 349.228 +20.720000000 21.060000000 233.082 +21.260000000 21.500000000 246.942 +21.000000000 21.540000000 97.9989 +21.520000000 21.880000000 349.228 +21.760000000 22.100000000 246.942 +22.100000000 22.220000000 293.665 +22.020000000 22.340000000 349.228 +22.260000000 22.560000000 246.942 +22.520000000 22.640000000 130.813 +22.840000000 23.000000000 130.813 +22.500000000 23.200000000 391.995 +23.080000000 23.240000000 130.813 +23.280000000 23.440000000 130.813 +22.760000000 23.700000000 233.082 +23.520000000 23.840000000 261.626 +23.480000000 23.840000000 329.628 +23.740000000 24.140000000 233.082 +24.060000000 24.220000000 261.626 +24.060000000 24.280000000 92.4986 +24.080000000 24.280000000 311.127 +24.540000000 24.740000000 311.127 +24.540000000 24.760000000 261.626 +24.220000000 25.120000000 220 +25.040000000 25.300000000 97.9989 +25.000000000 25.320000000 233.082 +25.340000000 25.560000000 97.9989 +25.480000000 25.800000000 391.995 +25.540000000 26.400000000 77.7817 +26.500000000 27.140000000 155.563 +27.000000000 27.400000000 174.614 +27.500000000 27.620000000 349.228 +27.620000000 27.900000000 174.614 +27.960000000 28.220000000 349.228 +28.000000000 28.360000000 174.614 +28.520000000 28.780000000 587.33 +28.520000000 28.880000000 830.609 +28.400000000 29.380000000 116.541 +29.600000000 29.760000000 349.228 +29.080000000 29.960000000 233.082 +29.580000000 30.100000000 174.614 +30.080000000 30.740000000 146.832 +30.540000000 30.800000000 349.228 +30.640000000 31.140000000 174.614 +31.020000000 31.820000000 146.832 +31.580000000 32.400000000 116.541
--- a/testdata/TRIOS-silvet/mozart/viola.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/viola.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,153 +1,65 @@ -9.520000000 9.760000000 311.127 -9.760000000 10.160000000 523.251 -10.040000000 10.240000000 622.254 -9.960000000 10.320000000 311.127 -10.240000000 10.320000000 1318.51 -10.240000000 10.400000000 783.991 -10.400000000 10.480000000 830.609 +9.500000000 9.620000000 932.328 +9.520000000 9.720000000 1567.98 +9.620000000 9.740000000 622.254 +9.460000000 9.800000000 311.127 +9.760000000 9.880000000 1318.51 +9.740000000 9.940000000 783.991 +9.700000000 10.120000000 523.251 +9.960000000 10.280000000 311.127 +9.680000000 10.480000000 261.626 10.400000000 10.520000000 277.183 -10.240000000 10.520000000 523.251 -9.680000000 10.560000000 261.626 -10.720000000 10.920000000 698.456 -11.080000000 11.200000000 698.456 -11.320000000 11.400000000 698.456 -11.480000000 11.680000000 698.456 -11.760000000 11.880000000 698.456 -12.320000000 12.480000000 698.456 -12.560000000 12.680000000 1396.91 -12.560000000 12.800000000 369.994 -12.680000000 12.880000000 698.456 -12.880000000 12.960000000 369.994 -12.960000000 13.040000000 1046.5 -13.000000000 13.080000000 698.456 -13.160000000 13.480000000 698.456 -13.360000000 13.520000000 369.994 -13.600000000 13.680000000 698.456 -14.040000000 14.160000000 698.456 -13.880000000 14.200000000 1760 -14.080000000 14.320000000 369.994 -14.280000000 14.360000000 1046.5 -14.240000000 14.440000000 698.456 -14.520000000 14.600000000 1046.5 -14.480000000 14.720000000 698.456 -14.720000000 14.800000000 369.994 -14.680000000 14.880000000 1046.5 -14.840000000 15.000000000 698.456 -15.320000000 15.440000000 698.456 -15.840000000 15.920000000 698.456 -16.040000000 16.120000000 698.456 -16.240000000 16.400000000 698.456 -16.480000000 16.640000000 698.456 -16.880000000 16.960000000 698.456 -17.080000000 17.160000000 369.994 -17.160000000 17.240000000 1046.5 -17.200000000 17.440000000 698.456 -17.520000000 17.600000000 1046.5 -17.600000000 17.680000000 739.989 -17.680000000 17.840000000 369.994 -17.720000000 17.880000000 1046.5 -17.920000000 18.080000000 369.994 -18.000000000 18.080000000 1046.5 -17.480000000 18.120000000 698.456 -18.160000000 18.360000000 1046.5 -18.200000000 18.440000000 1760 -10.480000000 18.480000000 349.228 -18.360000000 18.520000000 698.456 -18.480000000 18.560000000 293.665 -18.400000000 18.560000000 369.994 -18.600000000 18.760000000 622.254 -18.640000000 18.760000000 932.328 -18.680000000 18.760000000 1567.98 -18.520000000 18.840000000 311.127 -18.840000000 19.040000000 783.991 -19.080000000 19.160000000 932.328 -19.120000000 19.200000000 622.254 -19.000000000 19.320000000 311.127 -19.320000000 19.440000000 783.991 -18.760000000 19.480000000 523.251 -19.400000000 19.480000000 739.989 -18.800000000 19.560000000 261.626 -19.600000000 19.760000000 466.164 -19.840000000 20.080000000 466.164 -20.360000000 20.440000000 466.164 -20.520000000 20.600000000 466.164 -20.800000000 20.920000000 466.164 -19.480000000 21.040000000 233.082 -20.960000000 21.400000000 493.883 -20.960000000 21.800000000 739.989 -21.920000000 22.000000000 739.989 -21.600000000 22.120000000 493.883 -22.080000000 22.200000000 739.989 -22.200000000 22.520000000 493.883 -20.920000000 22.600000000 246.942 -22.480000000 23.080000000 523.251 -22.360000000 23.120000000 261.626 -22.760000000 23.120000000 783.991 -23.280000000 23.360000000 1318.51 -23.240000000 23.440000000 659.255 -23.160000000 23.480000000 987.767 -23.440000000 23.520000000 1318.51 -23.200000000 23.520000000 1661.22 -23.000000000 23.640000000 329.628 -23.560000000 23.680000000 783.991 -23.760000000 23.880000000 783.991 -23.480000000 24.000000000 391.995 -23.880000000 24.040000000 415.305 -24.120000000 24.200000000 932.328 -24.080000000 24.400000000 466.164 -24.440000000 24.560000000 466.164 -24.640000000 24.720000000 466.164 -24.160000000 24.720000000 880 -24.760000000 24.840000000 932.328 -23.960000000 25.040000000 440 -25.120000000 25.200000000 233.082 -25.080000000 25.200000000 493.883 -25.320000000 25.400000000 932.328 -25.320000000 25.400000000 1396.91 -25.520000000 25.600000000 369.994 -24.800000000 25.600000000 466.164 -25.840000000 26.040000000 783.991 -26.000000000 26.080000000 1396.91 -25.920000000 26.280000000 1174.66 -26.240000000 26.400000000 1567.98 -26.480000000 26.560000000 739.989 -26.240000000 26.600000000 311.127 -26.520000000 26.640000000 1174.66 -25.600000000 26.880000000 391.995 -26.720000000 26.880000000 622.254 -26.680000000 26.920000000 1567.98 -26.680000000 27.000000000 311.127 -27.200000000 27.440000000 587.33 -27.000000000 28.000000000 293.665 -28.040000000 28.160000000 369.994 -28.080000000 28.200000000 1760 -28.120000000 28.240000000 698.456 -28.000000000 28.320000000 349.228 -28.320000000 28.400000000 932.328 -28.320000000 28.520000000 1567.98 -28.240000000 28.720000000 311.127 -28.520000000 29.080000000 293.665 -29.000000000 29.600000000 233.082 -29.880000000 30.000000000 1479.98 -29.480000000 30.080000000 293.665 -30.000000000 30.120000000 1046.5 -30.120000000 30.200000000 698.456 -30.240000000 30.440000000 1046.5 -29.960000000 30.520000000 349.228 -30.720000000 30.920000000 587.33 -30.840000000 30.920000000 880 -30.480000000 31.040000000 293.665 -31.040000000 31.160000000 698.456 -31.040000000 31.160000000 1046.5 -31.040000000 31.160000000 1244.51 -31.400000000 31.480000000 1396.91 -31.320000000 31.480000000 1760 -30.960000000 31.560000000 349.228 -31.480000000 32.320000000 466.164 -35.880000000 35.960000000 349.228 -35.960000000 36.040000000 587.33 -36.120000000 36.200000000 97.9989 -36.120000000 36.200000000 130.813 -36.120000000 36.200000000 138.591 -36.120000000 36.200000000 1661.22 -36.120000000 36.200000000 1760 +10.160000000 10.520000000 523.251 +10.500000000 13.400000000 349.228 +13.440000000 14.240000000 349.228 +14.580000000 14.700000000 698.456 +14.280000000 14.720000000 349.228 +14.780000000 15.060000000 349.228 +15.100000000 16.280000000 349.228 +17.900000000 18.020000000 369.994 +17.960000000 18.080000000 698.456 +18.160000000 18.280000000 698.456 +16.320000000 18.460000000 349.228 +18.100000000 18.500000000 369.994 +18.540000000 18.800000000 311.127 +18.760000000 19.100000000 523.251 +18.780000000 19.180000000 261.626 +19.000000000 19.260000000 311.127 +19.240000000 19.420000000 783.991 +19.320000000 19.480000000 523.251 +19.240000000 19.520000000 261.626 +19.560000000 21.040000000 233.082 +20.960000000 21.160000000 246.942 +21.220000000 21.400000000 246.942 +21.500000000 21.620000000 261.626 +21.760000000 21.880000000 739.989 +21.900000000 22.020000000 493.883 +21.620000000 22.220000000 246.942 +22.240000000 22.520000000 246.942 +22.560000000 22.720000000 523.251 +22.480000000 22.880000000 261.626 +22.880000000 23.000000000 783.991 +22.740000000 23.040000000 523.251 +22.900000000 23.060000000 261.626 +23.220000000 23.420000000 1046.5 +23.080000000 23.520000000 329.628 +23.520000000 23.920000000 391.995 +23.880000000 24.000000000 415.305 +24.160000000 24.380000000 440 +24.400000000 24.540000000 880 +24.440000000 25.000000000 440 +24.960000000 25.540000000 466.164 +25.680000000 26.280000000 391.995 +26.280000000 26.540000000 311.127 +26.500000000 26.780000000 391.995 +26.720000000 26.920000000 311.127 +27.060000000 27.660000000 293.665 +27.780000000 27.940000000 293.665 +28.140000000 28.260000000 349.228 +28.240000000 28.520000000 311.127 +28.520000000 29.000000000 293.665 +29.020000000 29.540000000 233.082 +29.520000000 30.020000000 293.665 +29.980000000 30.460000000 349.228 +30.480000000 30.980000000 293.665 +30.960000000 31.520000000 349.228 +31.480000000 32.220000000 466.164
--- a/testdata/TRIOS-silvet/mozart/viola_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/mozart/viola_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,118 +1,44 @@ -9.680000000 9.760000000 932.328 -9.680000000 9.760000000 1567.98 -9.680000000 9.800000000 1244.51 -9.520000000 9.840000000 311.127 -9.960000000 10.040000000 523.251 -9.760000000 10.160000000 261.626 -10.040000000 10.280000000 622.254 -10.040000000 10.360000000 311.127 -10.280000000 10.600000000 261.626 -10.840000000 10.920000000 698.456 -11.280000000 11.360000000 1396.91 -11.280000000 11.600000000 698.456 -11.760000000 11.880000000 698.456 -11.800000000 11.920000000 1046.5 -12.160000000 12.240000000 1046.5 -12.320000000 12.440000000 1046.5 -12.560000000 12.640000000 1046.5 -12.680000000 12.760000000 698.456 -12.840000000 12.920000000 698.456 -12.840000000 12.920000000 1396.91 -13.080000000 13.200000000 1396.91 -13.160000000 13.280000000 1046.5 -13.200000000 13.320000000 698.456 -14.080000000 14.160000000 698.456 -14.280000000 14.400000000 698.456 -14.520000000 14.640000000 698.456 -14.760000000 15.120000000 698.456 -15.280000000 15.360000000 1046.5 -15.160000000 15.680000000 698.456 -16.040000000 16.120000000 698.456 -16.400000000 16.560000000 698.456 -16.880000000 16.960000000 698.456 -17.760000000 17.880000000 698.456 -17.960000000 18.080000000 698.456 -18.160000000 18.240000000 698.456 -10.480000000 18.600000000 349.228 -18.560000000 18.760000000 622.254 -18.560000000 18.920000000 311.127 -18.840000000 19.040000000 523.251 -18.760000000 19.160000000 261.626 -19.000000000 19.240000000 622.254 -19.040000000 19.360000000 311.127 -19.400000000 19.480000000 523.251 -19.240000000 19.640000000 261.626 -19.960000000 20.240000000 466.164 -20.360000000 20.440000000 932.328 -20.280000000 20.600000000 466.164 -20.800000000 21.000000000 466.164 -19.560000000 21.120000000 233.082 -21.280000000 21.400000000 739.989 -21.280000000 21.440000000 1244.51 -21.080000000 21.520000000 493.883 -21.600000000 21.720000000 493.883 -21.320000000 21.920000000 987.767 -21.960000000 22.120000000 987.767 -22.200000000 22.280000000 987.767 -21.800000000 22.560000000 493.883 -21.000000000 22.640000000 246.942 -22.600000000 22.720000000 523.251 -22.720000000 23.040000000 1046.5 -22.960000000 23.080000000 523.251 -22.560000000 23.160000000 261.626 -23.040000000 23.640000000 329.628 -23.600000000 23.840000000 783.991 -23.880000000 24.040000000 783.991 -23.520000000 24.120000000 391.995 -24.000000000 25.080000000 440 -25.120000000 25.200000000 932.328 -25.320000000 25.400000000 932.328 -25.520000000 25.600000000 932.328 -25.000000000 25.640000000 466.164 -25.840000000 26.040000000 783.991 -25.600000000 26.360000000 391.995 -26.440000000 26.560000000 622.254 -26.280000000 26.640000000 311.127 -26.560000000 26.840000000 391.995 -26.760000000 27.000000000 622.254 -26.720000000 27.120000000 311.127 -27.240000000 27.320000000 1174.66 -27.280000000 27.400000000 587.33 -27.480000000 27.560000000 587.33 -27.400000000 27.680000000 1479.98 -27.680000000 27.760000000 587.33 -27.680000000 27.840000000 1174.66 -27.000000000 28.080000000 293.665 -27.960000000 28.360000000 349.228 -28.280000000 28.440000000 622.254 -28.440000000 28.520000000 1244.51 -28.240000000 28.640000000 311.127 -28.800000000 28.920000000 587.33 -28.520000000 29.040000000 293.665 -29.200000000 29.480000000 932.328 -28.960000000 29.680000000 233.082 -29.640000000 29.720000000 587.33 -29.760000000 29.880000000 1174.66 -29.760000000 30.000000000 1479.98 -29.480000000 30.080000000 293.665 -30.120000000 30.200000000 698.456 -30.360000000 30.480000000 1046.5 -30.000000000 30.600000000 349.228 -30.680000000 30.840000000 587.33 -30.920000000 31.000000000 1174.66 -30.920000000 31.000000000 1479.98 -30.480000000 31.080000000 293.665 -31.440000000 31.520000000 1046.5 -30.960000000 31.600000000 349.228 -32.080000000 32.280000000 932.328 -32.400000000 32.520000000 932.328 -31.520000000 32.600000000 466.164 -35.880000000 36.000000000 415.305 -35.960000000 36.040000000 311.127 -35.840000000 36.040000000 349.228 -36.000000000 36.080000000 138.591 -36.000000000 36.080000000 1479.98 -36.080000000 36.160000000 87.3071 -36.080000000 36.160000000 123.471 -36.080000000 36.160000000 155.563 -36.080000000 36.160000000 195.998 +9.620000000 9.760000000 622.254 +9.480000000 9.880000000 311.127 +9.720000000 10.140000000 261.626 +10.140000000 10.260000000 622.254 +10.000000000 10.360000000 311.127 +10.240000000 10.580000000 261.626 +10.480000000 18.580000000 349.228 +18.640000000 18.800000000 622.254 +18.580000000 18.860000000 311.127 +18.780000000 19.120000000 261.626 +19.060000000 19.320000000 311.127 +19.260000000 19.600000000 261.626 +19.780000000 19.900000000 466.164 +20.260000000 20.440000000 466.164 +20.500000000 20.620000000 466.164 +19.600000000 21.060000000 233.082 +21.140000000 21.280000000 493.883 +21.420000000 21.640000000 493.883 +21.740000000 21.900000000 493.883 +21.980000000 22.100000000 493.883 +22.360000000 22.520000000 493.883 +21.020000000 22.580000000 246.942 +22.580000000 23.120000000 261.626 +23.080000000 23.600000000 329.628 +23.580000000 24.020000000 391.995 +24.020000000 25.040000000 440 +25.000000000 25.600000000 466.164 +26.040000000 26.180000000 783.991 +25.640000000 26.320000000 391.995 +26.280000000 26.600000000 311.127 +26.580000000 26.820000000 391.995 +26.780000000 27.060000000 311.127 +27.020000000 28.020000000 293.665 +28.000000000 28.300000000 349.228 +28.300000000 28.440000000 622.254 +28.280000000 28.600000000 311.127 +28.540000000 29.000000000 293.665 +29.300000000 29.500000000 466.164 +29.020000000 29.600000000 233.082 +29.520000000 30.040000000 293.665 +30.020000000 30.540000000 349.228 +30.520000000 31.020000000 293.665 +31.020000000 31.540000000 349.228 +31.520000000 32.540000000 466.164
--- a/testdata/TRIOS-silvet/schubert/cello.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/cello.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,138 +1,99 @@ -0.680000000 .800000000 195.998 -0.640000000 .880000000 65.4064 -0.760000000 .960000000 329.628 -0.880000000 1.000000000 195.998 -2.000000000 2.120000000 261.626 -2.600000000 2.680000000 391.995 -2.600000000 2.720000000 261.626 -3.040000000 3.200000000 174.614 -3.040000000 3.240000000 261.626 -3.000000000 3.280000000 92.4986 -2.960000000 3.320000000 87.3071 -0.560000000 3.640000000 130.813 -3.720000000 3.960000000 261.626 -4.400000000 4.560000000 261.626 -5.120000000 5.320000000 261.626 -5.520000000 5.640000000 92.4986 -5.520000000 5.720000000 174.614 -5.680000000 5.760000000 261.626 -5.680000000 5.760000000 391.995 -4.280000000 6.120000000 130.813 -9.000000000 9.400000000 415.305 -8.760000000 9.520000000 207.652 -9.480000000 9.720000000 739.989 -9.560000000 9.760000000 698.456 -9.800000000 9.880000000 739.989 -9.880000000 10.160000000 698.456 -10.160000000 10.240000000 369.994 -9.280000000 10.480000000 349.228 -10.480000000 10.600000000 587.33 -10.480000000 10.640000000 1174.66 -10.320000000 10.760000000 293.665 -10.600000000 11.280000000 311.127 -11.280000000 11.840000000 391.995 -11.640000000 11.840000000 1174.66 -12.240000000 12.320000000 369.994 -11.240000000 12.400000000 195.998 -11.840000000 12.800000000 349.228 -12.720000000 12.800000000 932.328 -12.520000000 12.920000000 311.127 -12.920000000 13.040000000 880 -12.800000000 13.280000000 293.665 -13.480000000 13.800000000 523.251 -14.000000000 14.080000000 523.251 -13.160000000 14.560000000 261.626 -19.280000000 19.360000000 587.33 -18.960000000 19.400000000 391.995 -19.280000000 19.440000000 932.328 -18.680000000 19.680000000 195.998 -19.760000000 20.040000000 932.328 -19.800000000 20.160000000 1244.51 -20.080000000 20.200000000 932.328 -20.160000000 20.280000000 622.254 -19.280000000 20.440000000 311.127 +0.640000000 .760000000 261.626 +0.540000000 .780000000 195.998 +0.620000000 1.020000000 65.4064 +0.600000000 1.020000000 329.628 +0.880000000 1.040000000 195.998 +1.120000000 1.280000000 65.4064 +1.940000000 2.120000000 261.626 +0.480000000 3.020000000 130.813 +3.040000000 3.160000000 174.614 +3.020000000 3.220000000 92.4986 +2.960000000 3.340000000 87.3071 +3.120000000 3.600000000 130.813 +3.740000000 3.860000000 130.813 +3.740000000 3.960000000 261.626 +4.440000000 4.560000000 261.626 +5.080000000 5.300000000 261.626 +4.280000000 5.580000000 130.813 +5.560000000 5.700000000 174.614 +5.620000000 6.080000000 130.813 +8.720000000 8.840000000 207.652 +8.760000000 8.880000000 220 +8.880000000 9.380000000 415.305 +8.860000000 9.540000000 207.652 +9.460000000 9.700000000 739.989 +9.520000000 9.700000000 1760 +9.760000000 9.880000000 739.989 +9.940000000 10.060000000 739.989 +9.280000000 10.460000000 349.228 +10.340000000 10.680000000 293.665 +10.660000000 11.260000000 311.127 +11.460000000 11.840000000 391.995 +11.880000000 12.000000000 349.228 +11.260000000 12.320000000 195.998 +12.080000000 12.700000000 349.228 +12.540000000 12.840000000 311.127 +12.800000000 13.100000000 293.665 +13.280000000 13.780000000 261.626 +13.820000000 14.160000000 261.626 +18.880000000 19.000000000 1174.66 +19.100000000 19.280000000 587.33 +19.080000000 19.300000000 1760 +19.280000000 19.400000000 622.254 +18.640000000 19.440000000 391.995 +18.600000000 19.700000000 195.998 +19.900000000 20.040000000 932.328 +19.300000000 20.400000000 311.127 20.320000000 20.440000000 329.628 -20.360000000 20.440000000 739.989 -20.480000000 20.560000000 1046.5 -20.280000000 20.880000000 349.228 -20.840000000 20.920000000 622.254 -21.040000000 21.160000000 932.328 -21.160000000 21.240000000 349.228 -20.600000000 21.280000000 311.127 -21.200000000 21.400000000 329.628 -21.400000000 21.920000000 783.991 -21.400000000 21.920000000 1174.66 -21.280000000 22.080000000 391.995 -21.920000000 22.400000000 830.609 -22.160000000 22.400000000 1661.22 -21.800000000 22.760000000 415.305 -22.600000000 22.880000000 1174.66 -22.520000000 22.920000000 391.995 -22.840000000 23.360000000 349.228 -23.360000000 23.480000000 932.328 -23.360000000 23.480000000 1244.51 -23.560000000 23.680000000 622.254 -23.840000000 23.920000000 622.254 -23.160000000 24.440000000 311.127 -28.920000000 29.440000000 391.995 -29.640000000 29.720000000 466.164 -28.760000000 29.760000000 195.998 -30.040000000 30.120000000 1174.66 -29.840000000 30.160000000 466.164 -30.200000000 30.360000000 466.164 -30.640000000 30.720000000 466.164 -29.400000000 30.760000000 932.328 -29.400000000 30.960000000 233.082 -31.680000000 31.840000000 932.328 -31.440000000 31.880000000 311.127 -31.760000000 31.880000000 466.164 -31.840000000 31.920000000 622.254 -31.280000000 32.160000000 155.563 -32.040000000 32.240000000 523.251 -32.360000000 32.440000000 523.251 -32.520000000 32.640000000 523.251 -31.840000000 33.320000000 261.626 -33.720000000 33.880000000 493.883 -34.040000000 34.200000000 493.883 -33.320000000 36.200000000 246.942 -36.440000000 36.520000000 523.251 -36.200000000 37.120000000 261.626 -37.080000000 38.720000000 246.942 -38.680000000 39.480000000 261.626 -39.600000000 40.680000000 246.942 -40.640000000 41.200000000 261.626 -42.240000000 42.520000000 311.127 -42.520000000 42.600000000 698.456 -42.680000000 42.760000000 1046.5 -42.600000000 42.760000000 1760 -42.720000000 42.800000000 698.456 -42.560000000 42.880000000 349.228 -42.920000000 43.000000000 415.305 -42.840000000 43.160000000 1174.66 +20.300000000 20.820000000 349.228 +20.620000000 21.260000000 311.127 +21.160000000 21.300000000 329.628 +21.300000000 21.840000000 391.995 +21.720000000 21.880000000 783.991 +21.720000000 21.880000000 1174.66 +21.860000000 21.980000000 391.995 +21.820000000 22.580000000 415.305 +22.680000000 22.820000000 391.995 +22.860000000 23.220000000 349.228 +23.180000000 24.240000000 311.127 +28.680000000 28.800000000 391.995 +29.180000000 29.300000000 587.33 +29.280000000 29.400000000 1174.66 +28.820000000 29.480000000 391.995 +28.660000000 29.720000000 195.998 +29.580000000 29.720000000 932.328 +29.860000000 29.980000000 466.164 +29.760000000 30.060000000 932.328 +30.100000000 30.240000000 932.328 +30.280000000 30.400000000 932.328 +29.420000000 30.860000000 233.082 +31.820000000 31.940000000 311.127 +31.380000000 32.060000000 155.563 +31.860000000 32.820000000 261.626 +32.840000000 33.220000000 261.626 +33.500000000 34.880000000 246.942 +34.920000000 36.160000000 246.942 +36.220000000 37.100000000 261.626 +37.080000000 38.740000000 246.942 +38.660000000 39.540000000 261.626 +39.620000000 40.700000000 246.942 +40.620000000 41.240000000 261.626 +42.220000000 42.520000000 311.127 +42.520000000 42.740000000 739.989 +42.580000000 42.740000000 1760 +42.520000000 42.900000000 349.228 +42.820000000 43.160000000 1174.66 42.800000000 43.280000000 391.995 -43.760000000 43.880000000 830.609 -44.160000000 44.280000000 830.609 -43.120000000 44.480000000 415.305 -44.640000000 44.760000000 783.991 -45.080000000 45.200000000 783.991 -44.400000000 45.240000000 1174.66 -44.320000000 45.360000000 391.995 -45.240000000 45.880000000 349.228 -46.000000000 46.240000000 1244.51 -46.560000000 46.640000000 622.254 -45.640000000 46.880000000 311.127 -47.160000000 47.560000000 311.127 -47.440000000 47.560000000 329.628 -47.520000000 47.640000000 369.994 -47.600000000 47.680000000 1244.51 -47.560000000 47.760000000 739.989 -47.680000000 47.880000000 369.994 -47.440000000 47.920000000 349.228 -48.000000000 48.120000000 783.991 -47.840000000 48.200000000 391.995 -48.600000000 48.880000000 830.609 -47.840000000 49.480000000 415.305 -50.000000000 50.080000000 1174.66 -49.360000000 50.400000000 391.995 -50.360000000 50.880000000 349.228 -50.960000000 51.280000000 311.127 +43.660000000 43.880000000 830.609 +43.080000000 44.400000000 415.305 +45.080000000 45.220000000 1174.66 +44.360000000 45.240000000 391.995 +45.240000000 45.780000000 349.228 +45.660000000 46.760000000 311.127 +47.200000000 47.480000000 311.127 +47.600000000 47.780000000 369.994 +47.880000000 48.040000000 391.995 +48.120000000 49.400000000 415.305 +49.680000000 50.100000000 391.995 +50.160000000 50.360000000 391.995 +50.360000000 50.800000000 349.228
--- a/testdata/TRIOS-silvet/schubert/cello_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/cello_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,152 +1,98 @@ -0.680000000 .880000000 65.4064 -1.200000000 1.280000000 65.4064 -0.680000000 1.360000000 195.998 -0.760000000 1.400000000 329.628 -0.640000000 1.480000000 261.626 -1.560000000 1.880000000 261.626 -2.880000000 2.960000000 659.255 -1.360000000 3.040000000 391.995 -1.920000000 3.080000000 261.626 -2.960000000 3.160000000 87.3071 -3.200000000 3.320000000 87.3071 -3.080000000 3.320000000 440 -2.960000000 3.480000000 174.614 -3.320000000 5.560000000 391.995 -5.560000000 5.760000000 440 -5.680000000 5.800000000 87.3071 -5.400000000 5.880000000 174.614 -3.200000000 6.120000000 261.626 -5.760000000 6.400000000 391.995 -6.160000000 6.440000000 261.626 -0.720000000 6.520000000 130.813 -8.920000000 9.000000000 830.609 -8.720000000 9.640000000 415.305 -8.640000000 9.720000000 207.652 -9.920000000 10.040000000 698.456 -10.320000000 10.440000000 698.456 -9.280000000 10.560000000 349.228 -10.320000000 10.760000000 293.665 -11.000000000 11.200000000 1244.51 -11.120000000 11.320000000 622.254 -10.680000000 11.400000000 311.127 -11.360000000 11.480000000 587.33 -11.600000000 11.680000000 587.33 -11.760000000 11.840000000 783.991 -11.880000000 12.000000000 587.33 -11.280000000 12.640000000 391.995 -12.760000000 12.840000000 622.254 -11.840000000 12.880000000 349.228 -12.680000000 12.880000000 391.995 -12.520000000 12.920000000 311.127 -11.200000000 12.960000000 195.998 -12.840000000 13.200000000 293.665 -13.120000000 15.160000000 261.626 -18.960000000 19.040000000 587.33 -19.160000000 19.360000000 587.33 -19.480000000 19.560000000 587.33 -19.600000000 19.680000000 783.991 -18.680000000 19.760000000 391.995 -18.560000000 19.840000000 195.998 -19.560000000 20.000000000 1244.51 -20.080000000 20.160000000 1244.51 -19.280000000 20.480000000 311.127 -20.320000000 20.760000000 349.228 -20.640000000 21.360000000 311.127 -21.280000000 22.000000000 391.995 -21.920000000 22.600000000 415.305 -22.560000000 22.960000000 391.995 -22.840000000 23.200000000 349.228 -23.320000000 23.480000000 1244.51 -23.880000000 24.000000000 622.254 -24.520000000 24.600000000 622.254 -24.600000000 24.720000000 1244.51 -24.720000000 24.880000000 622.254 -23.160000000 24.960000000 311.127 -28.880000000 28.960000000 587.33 -29.040000000 29.160000000 587.33 -29.200000000 29.400000000 587.33 -29.440000000 29.520000000 698.456 -28.800000000 29.600000000 391.995 -29.600000000 29.680000000 698.456 -29.440000000 29.680000000 783.991 -28.680000000 29.800000000 195.998 -29.600000000 29.800000000 466.164 -29.840000000 30.160000000 466.164 -29.800000000 30.280000000 698.456 -30.200000000 30.360000000 466.164 -30.400000000 30.560000000 466.164 -30.400000000 30.600000000 698.456 -30.600000000 30.760000000 466.164 -30.800000000 30.960000000 698.456 -29.400000000 31.040000000 233.082 -31.520000000 31.640000000 783.991 -31.200000000 32.320000000 155.563 -31.840000000 33.320000000 261.626 -33.240000000 33.360000000 493.883 -33.320000000 33.520000000 1479.98 -33.520000000 33.600000000 493.883 -33.720000000 33.840000000 493.883 -33.920000000 34.000000000 1479.98 -33.920000000 34.240000000 493.883 -34.560000000 34.640000000 739.989 -34.400000000 34.640000000 1479.98 -34.360000000 35.080000000 493.883 -34.920000000 35.080000000 739.989 -35.200000000 35.320000000 739.989 -35.120000000 35.400000000 493.883 -35.200000000 35.520000000 1479.98 -35.440000000 35.640000000 739.989 -35.720000000 35.800000000 1760 -35.720000000 35.840000000 739.989 -35.600000000 35.960000000 493.883 -36.040000000 36.240000000 493.883 -36.040000000 36.240000000 739.989 -33.240000000 36.320000000 246.942 -36.200000000 37.040000000 261.626 -37.920000000 38.000000000 739.989 -36.960000000 38.280000000 493.883 -38.240000000 38.360000000 1479.98 -38.320000000 38.440000000 739.989 -38.400000000 38.480000000 493.883 -38.520000000 38.600000000 1479.98 -38.560000000 38.680000000 493.883 -36.960000000 38.720000000 246.942 -38.640000000 39.480000000 261.626 -39.480000000 39.840000000 493.883 -39.800000000 39.880000000 1479.98 -39.920000000 40.040000000 493.883 -40.120000000 40.200000000 493.883 -40.200000000 40.280000000 739.989 -40.200000000 40.280000000 1479.98 -40.360000000 40.440000000 1479.98 -40.320000000 40.560000000 493.883 -40.600000000 40.680000000 1479.98 -39.400000000 40.720000000 246.942 -40.680000000 41.560000000 261.626 -42.400000000 42.520000000 1244.51 -42.240000000 42.600000000 311.127 -42.520000000 42.880000000 349.228 -42.840000000 43.280000000 391.995 -44.160000000 44.240000000 830.609 -43.200000000 44.440000000 415.305 -44.360000000 45.400000000 391.995 -45.240000000 45.880000000 349.228 -45.800000000 45.880000000 1244.51 -45.920000000 46.000000000 622.254 -46.000000000 46.120000000 1244.51 -46.240000000 46.320000000 1244.51 -46.440000000 46.520000000 1244.51 -46.520000000 46.680000000 622.254 -46.800000000 46.920000000 1244.51 -45.640000000 47.000000000 311.127 -47.320000000 47.440000000 1244.51 -47.200000000 47.600000000 311.127 -47.480000000 47.920000000 349.228 -47.800000000 48.280000000 391.995 -48.200000000 49.440000000 415.305 -49.360000000 50.440000000 391.995 -50.320000000 50.800000000 349.228 -50.840000000 50.960000000 622.254 -51.000000000 51.160000000 622.254 -51.240000000 51.320000000 622.254 -50.720000000 51.600000000 311.127 +0.560000000 .680000000 65.4064 +0.640000000 .760000000 130.813 +0.740000000 .880000000 65.4064 +0.820000000 .940000000 466.164 +0.940000000 1.080000000 65.4064 +0.920000000 1.120000000 130.813 +0.580000000 1.120000000 195.998 +1.160000000 1.280000000 195.998 +1.120000000 1.340000000 65.4064 +0.620000000 1.340000000 329.628 +0.580000000 1.360000000 261.626 +1.420000000 1.600000000 391.995 +1.640000000 1.960000000 391.995 +1.420000000 2.020000000 261.626 +2.300000000 2.420000000 261.626 +2.560000000 2.820000000 261.626 +2.640000000 2.820000000 391.995 +1.340000000 3.060000000 130.813 +3.140000000 3.280000000 440 +3.100000000 3.380000000 174.614 +3.560000000 3.680000000 261.626 +3.560000000 3.680000000 391.995 +3.280000000 3.780000000 130.813 +3.820000000 3.940000000 261.626 +3.840000000 4.400000000 130.813 +4.520000000 4.660000000 261.626 +4.680000000 5.020000000 391.995 +5.100000000 5.400000000 391.995 +4.460000000 5.540000000 130.813 +4.680000000 5.540000000 261.626 +5.480000000 5.600000000 174.614 +5.580000000 5.700000000 87.3071 +5.660000000 5.820000000 174.614 +6.000000000 6.280000000 261.626 +6.100000000 6.280000000 391.995 +5.800000000 6.380000000 130.813 +8.860000000 9.000000000 415.305 +9.160000000 9.620000000 415.305 +8.680000000 9.680000000 207.652 +9.320000000 10.540000000 349.228 +10.360000000 10.700000000 293.665 +10.680000000 11.380000000 311.127 +11.560000000 11.780000000 391.995 +12.280000000 12.400000000 391.995 +11.880000000 12.820000000 349.228 +11.280000000 12.860000000 195.998 +12.540000000 12.880000000 311.127 +12.880000000 13.160000000 293.665 +13.180000000 15.080000000 261.626 +18.640000000 18.760000000 391.995 +19.260000000 19.700000000 391.995 +18.580000000 19.800000000 195.998 +19.260000000 20.420000000 311.127 +20.380000000 20.700000000 349.228 +20.660000000 21.320000000 311.127 +21.300000000 21.960000000 391.995 +21.940000000 22.580000000 415.305 +22.580000000 22.900000000 391.995 +22.880000000 23.160000000 349.228 +23.200000000 24.920000000 311.127 +29.200000000 29.440000000 587.33 +28.740000000 29.600000000 391.995 +28.680000000 29.740000000 195.998 +29.400000000 29.740000000 466.164 +29.980000000 30.120000000 466.164 +30.220000000 30.340000000 466.164 +29.420000000 31.020000000 233.082 +31.260000000 32.240000000 155.563 +31.860000000 33.240000000 261.626 +33.340000000 34.500000000 246.942 +34.520000000 35.000000000 246.942 +35.280000000 35.400000000 493.883 +35.420000000 35.560000000 493.883 +35.620000000 35.740000000 493.883 +36.020000000 36.140000000 493.883 +35.020000000 36.280000000 246.942 +36.220000000 36.980000000 261.626 +36.900000000 37.160000000 246.942 +37.220000000 38.700000000 246.942 +38.680000000 39.440000000 261.626 +39.460000000 39.720000000 246.942 +39.760000000 40.280000000 246.942 +40.340000000 40.680000000 246.942 +40.700000000 41.520000000 261.626 +42.260000000 42.560000000 311.127 +42.520000000 42.840000000 349.228 +42.840000000 43.240000000 391.995 +43.180000000 44.420000000 415.305 +44.400000000 45.360000000 391.995 +45.240000000 45.860000000 349.228 +45.680000000 46.960000000 311.127 +47.220000000 47.540000000 311.127 +47.500000000 47.860000000 349.228 +47.840000000 48.220000000 391.995 +48.200000000 49.420000000 415.305 +49.400000000 50.380000000 391.995 +50.360000000 50.760000000 349.228 +50.740000000 51.580000000 311.127
--- a/testdata/TRIOS-silvet/schubert/mix.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/mix.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,314 +1,208 @@ -0.680000000 .760000000 391.995 -0.680000000 .840000000 195.998 -0.720000000 .880000000 130.813 -1.240000000 1.600000000 130.813 -1.960000000 2.040000000 195.998 -1.880000000 2.080000000 391.995 -1.880000000 2.240000000 130.813 -2.560000000 2.800000000 311.127 -2.640000000 2.880000000 195.998 -2.800000000 2.880000000 932.328 -2.520000000 2.920000000 391.995 -2.480000000 2.960000000 130.813 -3.040000000 3.160000000 415.305 -3.200000000 3.280000000 932.328 -3.200000000 3.360000000 311.127 -3.240000000 3.360000000 391.995 -3.160000000 3.520000000 130.813 +0.640000000 .800000000 391.995 +0.540000000 .880000000 195.998 +0.820000000 .940000000 65.4064 +0.620000000 .960000000 329.628 +1.280000000 1.400000000 391.995 +1.880000000 2.100000000 391.995 +1.940000000 2.120000000 261.626 +1.900000000 2.160000000 195.998 +2.500000000 2.700000000 311.127 +2.540000000 2.760000000 195.998 +2.720000000 2.840000000 622.254 +2.760000000 2.880000000 311.127 +2.780000000 2.920000000 195.998 +2.580000000 3.000000000 391.995 +0.540000000 3.020000000 130.813 +3.040000000 3.160000000 349.228 +3.000000000 3.160000000 415.305 +3.060000000 3.240000000 87.3071 +3.200000000 3.320000000 932.328 +3.180000000 3.380000000 311.127 +3.220000000 3.380000000 391.995 +3.160000000 3.560000000 130.813 3.760000000 3.880000000 261.626 3.840000000 3.960000000 391.995 -4.440000000 4.520000000 932.328 +3.860000000 4.000000000 195.998 4.400000000 4.560000000 391.995 -5.080000000 5.160000000 195.998 -5.120000000 5.280000000 261.626 -5.120000000 5.320000000 932.328 -5.280000000 5.360000000 195.998 -4.320000000 5.400000000 130.813 -5.000000000 5.440000000 391.995 +4.440000000 4.620000000 195.998 +5.140000000 5.280000000 261.626 +5.020000000 5.300000000 195.998 +5.180000000 5.360000000 932.328 +4.340000000 5.420000000 130.813 +5.020000000 5.460000000 391.995 5.440000000 5.600000000 415.305 -5.720000000 5.840000000 311.127 -5.600000000 5.880000000 391.995 -5.680000000 5.920000000 783.991 -5.680000000 5.960000000 130.813 -6.600000000 6.680000000 987.767 -6.400000000 6.880000000 195.998 -6.880000000 7.040000000 622.254 -6.960000000 7.080000000 783.991 -6.920000000 7.280000000 932.328 -6.360000000 7.360000000 391.995 -7.280000000 7.360000000 987.767 -7.120000000 7.480000000 622.254 -7.400000000 7.520000000 932.328 -7.400000000 7.560000000 1244.51 -7.600000000 7.760000000 622.254 -7.600000000 7.840000000 195.998 -6.880000000 8.080000000 311.127 -8.200000000 8.320000000 830.609 -8.520000000 8.600000000 1046.5 -8.360000000 8.640000000 932.328 -8.520000000 8.960000000 523.251 -8.920000000 9.000000000 174.614 -9.120000000 9.360000000 415.305 -8.920000000 9.480000000 207.652 -9.800000000 9.880000000 739.989 -10.040000000 10.160000000 698.456 -10.040000000 10.280000000 466.164 -9.320000000 10.360000000 349.228 -10.080000000 10.400000000 932.328 -10.360000000 10.440000000 830.609 -10.360000000 10.640000000 415.305 -10.560000000 10.680000000 293.665 -10.680000000 10.760000000 783.991 -10.920000000 11.000000000 783.991 -10.680000000 11.080000000 391.995 -11.320000000 11.400000000 155.563 -10.680000000 11.640000000 311.127 -11.280000000 11.680000000 622.254 -11.600000000 11.680000000 783.991 -11.240000000 11.960000000 391.995 -11.880000000 12.000000000 493.883 -11.920000000 12.080000000 987.767 -11.960000000 12.160000000 97.9989 -12.080000000 12.160000000 1046.5 -12.160000000 12.240000000 987.767 -11.320000000 12.360000000 195.998 -12.240000000 12.440000000 830.609 -12.160000000 12.480000000 1244.51 -11.960000000 12.560000000 415.305 -12.000000000 12.680000000 349.228 -12.680000000 12.760000000 174.614 -12.600000000 12.800000000 783.991 -12.520000000 12.840000000 311.127 -12.400000000 12.920000000 97.9989 -12.480000000 12.920000000 391.995 -12.800000000 13.040000000 880 +5.600000000 5.800000000 391.995 +5.740000000 5.860000000 311.127 +5.720000000 5.900000000 195.998 +5.640000000 5.920000000 130.813 +6.280000000 6.880000000 195.998 +6.880000000 7.020000000 932.328 +7.000000000 7.160000000 622.254 +6.440000000 7.200000000 391.995 +7.140000000 7.320000000 932.328 +7.200000000 7.500000000 622.254 +7.600000000 7.780000000 195.998 +6.860000000 7.980000000 311.127 +8.220000000 8.360000000 830.609 +8.340000000 8.620000000 932.328 +8.520000000 8.900000000 523.251 +9.080000000 9.340000000 207.652 +9.320000000 9.480000000 349.228 +9.640000000 10.220000000 349.228 +10.060000000 10.260000000 466.164 +10.080000000 10.360000000 932.328 +10.380000000 10.540000000 415.305 +10.700000000 10.940000000 391.995 +10.780000000 11.240000000 311.127 +11.340000000 11.460000000 311.127 +11.260000000 11.480000000 622.254 +11.420000000 11.940000000 391.995 +11.900000000 12.020000000 493.883 +11.920000000 12.040000000 987.767 +11.960000000 12.080000000 415.305 +12.020000000 12.140000000 97.9989 +11.340000000 12.160000000 195.998 +12.300000000 12.420000000 1244.51 +12.100000000 12.500000000 415.305 +12.120000000 12.620000000 349.228 +12.620000000 12.780000000 311.127 +12.500000000 12.860000000 391.995 12.920000000 13.040000000 987.767 -12.920000000 13.120000000 293.665 -12.840000000 13.200000000 349.228 -13.160000000 13.320000000 311.127 -13.080000000 13.400000000 523.251 -12.880000000 13.480000000 1046.5 -13.320000000 13.640000000 932.328 -13.240000000 13.760000000 622.254 -13.680000000 13.840000000 932.328 -13.760000000 13.840000000 1244.51 -13.280000000 14.040000000 261.626 -13.400000000 14.080000000 311.127 -14.080000000 14.240000000 261.626 -14.440000000 14.520000000 155.563 -14.400000000 14.560000000 311.127 -14.960000000 15.160000000 155.563 -15.040000000 15.320000000 311.127 -14.960000000 15.440000000 195.998 -15.000000000 15.560000000 130.813 -15.720000000 15.840000000 155.563 -15.680000000 15.840000000 311.127 -15.640000000 16.000000000 1046.5 -15.600000000 16.080000000 523.251 -16.320000000 16.680000000 195.998 -16.640000000 16.760000000 987.767 -16.720000000 16.960000000 195.998 -16.360000000 16.960000000 391.995 -17.120000000 17.200000000 932.328 -17.160000000 17.280000000 622.254 -17.320000000 17.640000000 622.254 -17.520000000 17.800000000 1046.5 -16.960000000 17.920000000 311.127 -17.520000000 17.920000000 523.251 -18.120000000 18.400000000 1046.5 -18.040000000 18.520000000 523.251 -18.440000000 18.760000000 466.164 -18.480000000 18.760000000 932.328 -19.160000000 19.280000000 391.995 -18.800000000 19.640000000 195.998 -19.440000000 19.800000000 391.995 -19.920000000 20.000000000 932.328 -20.120000000 20.200000000 932.328 -19.560000000 20.400000000 311.127 -20.320000000 20.440000000 329.628 -20.320000000 20.800000000 349.228 -20.720000000 21.120000000 97.9989 -20.680000000 21.120000000 391.995 -21.040000000 21.160000000 932.328 -21.200000000 21.320000000 329.628 -21.440000000 21.600000000 130.813 -20.680000000 21.640000000 311.127 -21.640000000 21.720000000 987.767 -21.280000000 21.760000000 622.254 -21.720000000 21.840000000 195.998 -21.680000000 21.880000000 1174.66 -21.800000000 21.920000000 783.991 -21.520000000 21.960000000 391.995 -21.960000000 22.040000000 493.883 -22.040000000 22.200000000 830.609 -21.920000000 22.240000000 987.767 -22.200000000 22.400000000 174.614 -22.320000000 22.400000000 987.767 -21.880000000 22.480000000 349.228 -22.440000000 22.520000000 329.628 -21.840000000 22.560000000 415.305 -22.480000000 22.680000000 987.767 -22.560000000 22.720000000 932.328 -22.560000000 22.760000000 622.254 -22.440000000 22.800000000 311.127 -22.760000000 22.840000000 391.995 -21.200000000 23.000000000 97.9989 -22.840000000 23.080000000 174.614 -22.920000000 23.120000000 987.767 -22.720000000 23.160000000 293.665 -23.120000000 23.200000000 1046.5 -22.880000000 23.280000000 349.228 -23.080000000 23.320000000 523.251 -23.240000000 23.400000000 130.813 -23.240000000 23.400000000 155.563 -23.440000000 23.720000000 523.251 -23.320000000 23.800000000 261.626 -23.160000000 24.320000000 311.127 -24.440000000 24.640000000 155.563 -24.400000000 24.640000000 195.998 -24.400000000 24.640000000 311.127 -25.040000000 25.200000000 155.563 -25.080000000 25.400000000 311.127 -25.000000000 25.480000000 195.998 -25.120000000 25.520000000 130.813 -25.720000000 25.880000000 195.998 -25.800000000 25.920000000 155.563 -25.640000000 25.920000000 622.254 -25.680000000 26.000000000 311.127 -25.960000000 26.080000000 622.254 -26.280000000 26.400000000 195.998 -26.720000000 26.840000000 987.767 -26.920000000 27.000000000 146.832 -26.920000000 27.000000000 587.33 -26.960000000 27.040000000 783.991 -26.480000000 27.200000000 195.998 -27.120000000 27.280000000 783.991 -27.440000000 27.520000000 783.991 -27.640000000 27.760000000 783.991 -27.840000000 27.920000000 783.991 -26.320000000 28.120000000 391.995 -28.160000000 28.240000000 155.563 -28.160000000 28.240000000 1174.66 -27.560000000 28.400000000 195.998 -28.120000000 28.440000000 587.33 -28.240000000 28.480000000 311.127 -28.520000000 28.640000000 195.998 -28.680000000 28.800000000 783.991 -28.480000000 29.000000000 391.995 -29.200000000 29.400000000 391.995 -29.480000000 29.640000000 311.127 -28.760000000 29.680000000 195.998 -29.760000000 29.880000000 932.328 -29.880000000 30.000000000 466.164 -30.000000000 30.080000000 783.991 -29.960000000 30.200000000 932.328 -30.280000000 30.400000000 932.328 -30.000000000 30.440000000 391.995 -30.480000000 30.560000000 932.328 -29.480000000 30.640000000 233.082 -30.720000000 30.800000000 783.991 -30.600000000 30.840000000 391.995 -31.760000000 31.840000000 466.164 -31.520000000 31.880000000 311.127 -31.880000000 31.960000000 880 -31.360000000 32.040000000 155.563 -32.040000000 32.200000000 311.127 -31.880000000 32.200000000 440 -32.840000000 32.960000000 391.995 -31.720000000 33.200000000 261.626 -32.320000000 33.200000000 311.127 -33.160000000 33.280000000 391.995 -33.560000000 34.560000000 246.942 -34.680000000 34.760000000 246.942 -35.000000000 35.160000000 783.991 -35.360000000 35.440000000 246.942 -33.120000000 35.480000000 293.665 -35.640000000 35.840000000 293.665 -35.600000000 35.840000000 391.995 -36.200000000 36.440000000 195.998 -36.280000000 36.440000000 311.127 -36.280000000 36.680000000 261.626 -36.920000000 37.240000000 97.9989 -37.480000000 37.640000000 783.991 -37.680000000 37.760000000 246.942 -38.120000000 38.440000000 391.995 -36.880000000 38.560000000 293.665 -38.480000000 38.720000000 246.942 -38.760000000 38.840000000 622.254 -38.760000000 39.200000000 261.626 -39.320000000 39.720000000 97.9989 -39.680000000 39.840000000 391.995 -39.920000000 40.160000000 440 -40.280000000 40.360000000 246.942 -39.920000000 40.640000000 87.3071 -40.240000000 40.680000000 97.9989 -39.440000000 40.680000000 293.665 -40.600000000 40.960000000 523.251 -40.720000000 41.040000000 155.563 -41.160000000 41.520000000 622.254 -41.280000000 41.600000000 130.813 -41.400000000 41.640000000 195.998 -41.880000000 42.040000000 130.813 -41.840000000 42.200000000 1046.5 -41.800000000 42.280000000 523.251 -42.480000000 42.640000000 523.251 -42.520000000 42.760000000 155.563 -42.480000000 42.760000000 261.626 -42.680000000 42.760000000 1046.5 -42.600000000 42.800000000 349.228 +12.840000000 13.140000000 349.228 +13.100000000 13.280000000 523.251 +13.100000000 13.280000000 1046.5 +13.420000000 13.560000000 311.127 +13.380000000 13.560000000 932.328 +13.640000000 14.000000000 311.127 +15.020000000 15.220000000 311.127 +15.620000000 15.740000000 1046.5 +15.620000000 15.940000000 523.251 +16.600000000 16.720000000 195.998 +16.740000000 16.920000000 195.998 +16.440000000 16.920000000 391.995 +17.120000000 17.320000000 622.254 +16.940000000 17.520000000 311.127 +17.520000000 17.700000000 1046.5 +17.500000000 17.820000000 523.251 +17.540000000 17.860000000 311.127 +17.720000000 17.880000000 1046.5 +18.120000000 18.440000000 1046.5 +18.100000000 18.460000000 523.251 +18.460000000 18.620000000 932.328 +18.460000000 18.660000000 466.164 +18.900000000 19.560000000 195.998 +19.460000000 19.580000000 391.995 +19.560000000 20.380000000 311.127 +20.300000000 20.740000000 349.228 +20.800000000 20.940000000 97.9989 +20.640000000 20.940000000 391.995 +20.980000000 21.100000000 391.995 +20.680000000 21.220000000 311.127 +21.280000000 21.480000000 622.254 +21.380000000 21.500000000 311.127 +21.340000000 21.740000000 97.9989 +21.740000000 21.880000000 1174.66 +21.560000000 21.920000000 391.995 +21.920000000 22.040000000 987.767 +21.820000000 22.200000000 97.9989 +22.060000000 22.460000000 349.228 +21.880000000 22.540000000 415.305 +22.460000000 22.580000000 987.767 +22.480000000 22.600000000 311.127 +22.620000000 22.760000000 311.127 +22.620000000 22.800000000 97.9989 +22.940000000 23.060000000 987.767 +22.740000000 23.120000000 293.665 +22.920000000 23.200000000 349.228 +23.120000000 23.260000000 523.251 +23.420000000 23.540000000 523.251 +23.180000000 24.140000000 311.127 +25.760000000 25.880000000 311.127 +25.640000000 25.900000000 622.254 +26.900000000 27.020000000 587.33 +27.700000000 27.960000000 195.998 +26.440000000 28.000000000 391.995 +28.140000000 28.260000000 1174.66 +28.140000000 28.280000000 587.33 +28.500000000 28.780000000 391.995 +28.940000000 29.580000000 195.998 +30.000000000 30.380000000 391.995 +29.620000000 30.640000000 233.082 +30.640000000 30.800000000 391.995 +31.420000000 32.000000000 155.563 +31.880000000 32.160000000 440 +32.420000000 32.540000000 311.127 +32.580000000 32.740000000 311.127 +31.900000000 32.780000000 261.626 +32.960000000 33.160000000 261.626 +32.760000000 33.160000000 311.127 +33.240000000 33.360000000 97.9989 +33.880000000 34.400000000 246.942 +34.420000000 34.540000000 246.942 +34.400000000 34.600000000 97.9989 +33.440000000 34.980000000 293.665 +34.980000000 35.160000000 783.991 +35.060000000 35.440000000 293.665 +35.660000000 35.820000000 293.665 +35.620000000 35.840000000 391.995 +36.180000000 36.440000000 195.998 +36.240000000 36.440000000 311.127 +36.240000000 36.880000000 261.626 +37.200000000 37.400000000 246.942 +36.860000000 37.460000000 97.9989 +37.460000000 37.620000000 246.942 +37.480000000 37.660000000 783.991 +37.660000000 37.780000000 246.942 +37.820000000 37.940000000 246.942 +38.120000000 38.480000000 391.995 +36.840000000 38.560000000 293.665 +38.480000000 38.680000000 246.942 +38.800000000 38.920000000 622.254 +38.660000000 39.160000000 261.626 +39.660000000 39.800000000 391.995 +39.340000000 39.840000000 97.9989 +39.940000000 40.180000000 440 +40.000000000 40.600000000 87.3071 +40.140000000 40.640000000 97.9989 +39.600000000 40.640000000 293.665 +40.640000000 40.760000000 155.563 +40.580000000 40.900000000 523.251 +40.760000000 41.100000000 77.7817 +41.180000000 41.460000000 622.254 +41.840000000 42.000000000 1046.5 +41.820000000 42.180000000 523.251 +42.080000000 42.240000000 1046.5 +42.260000000 42.440000000 311.127 +42.520000000 42.660000000 261.626 +42.500000000 42.780000000 311.127 +42.580000000 42.780000000 349.228 42.760000000 43.000000000 622.254 -42.240000000 43.040000000 311.127 -43.000000000 43.160000000 391.995 -42.840000000 43.240000000 1174.66 -43.080000000 43.360000000 587.33 -43.720000000 43.840000000 1174.66 -43.720000000 44.000000000 587.33 -43.160000000 44.400000000 415.305 -44.360000000 44.720000000 195.998 -44.800000000 44.960000000 698.456 -44.640000000 45.000000000 622.254 -44.560000000 45.120000000 391.995 -45.040000000 45.160000000 349.228 -44.720000000 45.200000000 1174.66 -45.120000000 45.240000000 220 -45.000000000 45.240000000 440 -45.000000000 45.240000000 783.991 -45.160000000 45.280000000 698.456 -45.240000000 45.480000000 622.254 -45.440000000 45.520000000 987.767 -45.440000000 45.560000000 1174.66 -45.560000000 45.640000000 174.614 -45.400000000 45.640000000 587.33 -45.280000000 45.800000000 349.228 -46.240000000 46.400000000 622.254 -46.120000000 46.400000000 1046.5 -46.360000000 46.480000000 207.652 -45.640000000 46.480000000 523.251 -45.600000000 46.560000000 311.127 -46.480000000 46.680000000 622.254 -46.640000000 46.880000000 311.127 -46.920000000 47.120000000 1046.5 -46.560000000 47.320000000 523.251 -46.920000000 47.320000000 622.254 -47.160000000 47.520000000 311.127 -46.960000000 47.520000000 1244.51 -47.440000000 47.560000000 622.254 -47.640000000 47.720000000 739.989 -47.520000000 47.760000000 349.228 -47.800000000 48.040000000 622.254 -47.840000000 48.080000000 415.305 -48.080000000 48.160000000 391.995 -48.160000000 48.240000000 587.33 -48.800000000 48.920000000 587.33 -48.160000000 49.400000000 415.305 -49.720000000 49.840000000 783.991 -49.760000000 49.960000000 622.254 -50.080000000 50.200000000 880 -50.240000000 50.320000000 391.995 -50.320000000 50.520000000 987.767 -50.360000000 50.600000000 622.254 -50.360000000 50.760000000 349.228 -50.800000000 50.920000000 311.127 -50.720000000 51.000000000 523.251 -50.720000000 51.400000000 1046.5 -53.920000000 54.000000000 1396.91 +42.940000000 43.140000000 391.995 +42.960000000 43.180000000 1174.66 +43.100000000 43.260000000 587.33 +43.720000000 43.900000000 587.33 +43.160000000 44.360000000 415.305 +44.660000000 44.860000000 622.254 +44.720000000 45.020000000 391.995 +45.060000000 45.180000000 1174.66 +45.000000000 45.220000000 440 +45.260000000 45.440000000 622.254 +45.420000000 45.580000000 587.33 +45.340000000 45.700000000 349.228 +46.260000000 46.380000000 622.254 +45.640000000 46.500000000 311.127 +45.620000000 46.500000000 523.251 +46.400000000 46.520000000 622.254 +46.800000000 47.080000000 523.251 +46.960000000 47.100000000 1244.51 +47.100000000 47.220000000 622.254 +47.220000000 47.480000000 311.127 +47.800000000 47.960000000 622.254 +48.200000000 48.320000000 415.305 +48.380000000 49.340000000 415.305 +49.700000000 49.840000000 783.991 +49.760000000 49.940000000 622.254 +50.300000000 50.500000000 987.767 +50.360000000 50.560000000 622.254 +50.420000000 50.700000000 349.228 +50.680000000 51.400000000 1046.5
--- a/testdata/TRIOS-silvet/schubert/piano.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/piano.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,174 +1,122 @@ -5.720000000 5.800000000 783.991 -5.600000000 6.040000000 391.995 -6.960000000 7.080000000 783.991 -7.160000000 7.240000000 783.991 -6.960000000 7.440000000 391.995 -7.680000000 7.800000000 311.127 -7.600000000 7.840000000 195.998 -7.760000000 7.880000000 130.813 -7.800000000 7.880000000 155.563 -8.240000000 8.320000000 207.652 -8.200000000 8.320000000 830.609 -8.520000000 8.600000000 1046.5 -8.360000000 8.640000000 932.328 -8.520000000 8.960000000 523.251 -8.920000000 9.000000000 174.614 -10.040000000 10.320000000 466.164 -10.080000000 10.400000000 932.328 +5.660000000 5.820000000 311.127 +5.780000000 5.980000000 783.991 +5.600000000 6.220000000 391.995 +6.000000000 6.280000000 783.991 +6.340000000 6.520000000 311.127 +6.280000000 6.560000000 195.998 +6.300000000 6.620000000 130.813 +6.940000000 7.080000000 783.991 +6.980000000 7.140000000 311.127 +7.040000000 7.160000000 195.998 +6.940000000 7.540000000 391.995 +7.220000000 7.600000000 783.991 +7.620000000 7.760000000 155.563 +7.640000000 7.920000000 311.127 +7.560000000 7.940000000 195.998 +7.620000000 8.000000000 130.813 +8.220000000 8.340000000 207.652 +8.260000000 8.380000000 130.813 +8.200000000 8.420000000 830.609 +8.340000000 8.640000000 932.328 +8.520000000 8.760000000 1046.5 +8.520000000 8.980000000 523.251 +10.040000000 10.240000000 466.164 +10.080000000 10.360000000 932.328 10.360000000 10.640000000 415.305 -10.680000000 10.760000000 783.991 -10.760000000 10.840000000 311.127 -10.920000000 11.000000000 783.991 -10.680000000 11.160000000 391.995 -11.320000000 11.400000000 155.563 -11.360000000 11.600000000 311.127 -11.240000000 11.720000000 622.254 -11.880000000 12.160000000 493.883 -11.920000000 12.480000000 987.767 -12.080000000 12.520000000 1046.5 -11.880000000 13.000000000 97.9989 -12.800000000 13.000000000 880 -12.920000000 13.080000000 987.767 -13.080000000 13.480000000 1046.5 -13.080000000 13.520000000 523.251 -13.800000000 13.880000000 155.563 -13.760000000 13.920000000 311.127 -14.440000000 14.520000000 155.563 -14.400000000 14.560000000 311.127 -14.960000000 15.280000000 155.563 -15.040000000 15.400000000 311.127 -14.960000000 15.440000000 195.998 -15.000000000 15.560000000 130.813 -15.720000000 15.840000000 155.563 -15.680000000 15.840000000 311.127 -15.640000000 16.000000000 1046.5 -15.600000000 16.080000000 523.251 -17.480000000 17.920000000 523.251 -17.520000000 18.000000000 1046.5 -18.120000000 18.400000000 1046.5 -18.040000000 18.520000000 523.251 -18.440000000 18.760000000 466.164 -18.480000000 18.760000000 932.328 -19.440000000 19.840000000 391.995 -20.680000000 21.160000000 391.995 -21.440000000 21.640000000 130.813 -21.320000000 21.680000000 311.127 -21.280000000 21.800000000 622.254 -21.920000000 22.080000000 493.883 -21.920000000 22.240000000 987.767 -22.120000000 22.280000000 1046.5 -22.040000000 22.400000000 146.832 -22.200000000 22.400000000 174.614 -22.320000000 22.640000000 987.767 -22.560000000 22.680000000 440 -22.600000000 22.720000000 146.832 -20.720000000 23.040000000 97.9989 -22.800000000 23.120000000 880 -22.920000000 23.120000000 987.767 -23.120000000 23.200000000 1046.5 -23.200000000 23.280000000 130.813 -23.200000000 23.360000000 195.998 -23.160000000 23.360000000 311.127 -23.120000000 23.400000000 155.563 -23.280000000 23.440000000 1046.5 -23.080000000 23.560000000 523.251 -23.760000000 23.880000000 155.563 -23.760000000 23.880000000 195.998 -23.840000000 23.960000000 311.127 -24.440000000 24.600000000 311.127 -24.440000000 24.640000000 155.563 -24.400000000 24.640000000 195.998 -25.040000000 25.200000000 155.563 -25.080000000 25.400000000 311.127 -25.000000000 25.480000000 195.998 -25.120000000 25.520000000 130.813 -25.720000000 25.880000000 195.998 -25.800000000 25.920000000 155.563 -25.680000000 26.000000000 311.127 -25.640000000 26.080000000 622.254 -26.320000000 26.400000000 195.998 -26.920000000 27.000000000 146.832 -26.920000000 27.080000000 587.33 -26.920000000 27.080000000 1174.66 -27.080000000 27.160000000 146.832 -26.920000000 27.280000000 195.998 -27.520000000 28.040000000 195.998 -28.160000000 28.240000000 1174.66 -28.160000000 28.360000000 155.563 -28.240000000 28.400000000 195.998 -28.120000000 28.480000000 587.33 -28.240000000 28.520000000 311.127 -28.520000000 28.640000000 195.998 -28.680000000 28.760000000 783.991 -28.480000000 28.920000000 391.995 -30.000000000 30.080000000 783.991 -30.000000000 30.480000000 391.995 -30.720000000 30.800000000 783.991 -30.600000000 30.960000000 391.995 -31.880000000 31.960000000 880 +10.660000000 11.120000000 391.995 +11.260000000 11.500000000 622.254 +11.500000000 11.620000000 311.127 +11.900000000 12.020000000 987.767 +11.980000000 12.220000000 97.9989 +12.060000000 12.220000000 1046.5 +12.800000000 12.920000000 880 +12.480000000 12.940000000 97.9989 +12.920000000 13.040000000 987.767 +13.100000000 13.340000000 1046.5 +13.080000000 13.420000000 523.251 +14.420000000 14.540000000 311.127 +15.040000000 15.280000000 130.813 +15.000000000 15.340000000 311.127 +14.980000000 15.400000000 195.998 +15.720000000 15.860000000 311.127 +15.620000000 15.880000000 1046.5 +15.600000000 16.040000000 523.251 +17.520000000 17.700000000 1046.5 +17.720000000 17.900000000 1046.5 +17.500000000 17.980000000 523.251 +18.120000000 18.460000000 1046.5 +18.100000000 18.500000000 523.251 +18.460000000 18.660000000 932.328 +18.460000000 18.720000000 466.164 +19.440000000 19.680000000 391.995 +20.660000000 20.780000000 783.991 +20.640000000 21.140000000 391.995 +21.360000000 21.480000000 311.127 +21.280000000 21.700000000 622.254 +21.920000000 22.040000000 493.883 +21.920000000 22.060000000 987.767 +22.460000000 22.580000000 987.767 +20.700000000 22.960000000 97.9989 +22.820000000 23.060000000 880 +22.940000000 23.080000000 987.767 +23.080000000 23.440000000 523.251 +25.080000000 25.260000000 311.127 +25.740000000 25.860000000 195.998 +25.680000000 25.920000000 311.127 +25.640000000 26.000000000 622.254 +26.900000000 27.080000000 587.33 +27.540000000 28.020000000 195.998 +28.200000000 28.380000000 311.127 +28.140000000 28.440000000 587.33 +28.500000000 28.760000000 391.995 +30.000000000 30.460000000 391.995 +30.600000000 31.000000000 391.995 +31.000000000 31.120000000 195.998 +31.300000000 31.500000000 195.998 31.880000000 32.240000000 440 -32.840000000 33.000000000 391.995 -33.160000000 33.280000000 391.995 -35.000000000 35.200000000 783.991 -35.600000000 35.840000000 391.995 -36.200000000 36.480000000 195.998 -36.880000000 37.280000000 97.9989 -37.480000000 37.680000000 783.991 -38.120000000 38.480000000 391.995 -38.800000000 38.920000000 195.998 -39.320000000 39.800000000 97.9989 -39.640000000 39.840000000 391.995 -39.920000000 40.160000000 440 -40.280000000 40.400000000 493.883 -40.320000000 40.400000000 587.33 -39.920000000 40.640000000 87.3071 -40.240000000 40.680000000 97.9989 -40.720000000 40.800000000 233.082 -40.600000000 41.000000000 523.251 -40.720000000 41.040000000 155.563 -41.160000000 41.520000000 622.254 -41.400000000 41.640000000 195.998 -41.280000000 41.720000000 130.813 -41.880000000 42.040000000 130.813 -41.840000000 42.200000000 1046.5 -41.800000000 42.280000000 523.251 -42.480000000 42.680000000 523.251 -42.480000000 42.760000000 155.563 -42.480000000 42.760000000 261.626 -42.480000000 43.040000000 311.127 -42.760000000 43.040000000 622.254 -43.120000000 43.280000000 1174.66 -43.080000000 43.400000000 587.33 -43.720000000 43.880000000 1174.66 -43.600000000 44.000000000 587.33 -44.240000000 44.320000000 587.33 -44.360000000 44.680000000 195.998 -44.640000000 45.000000000 622.254 -44.800000000 45.000000000 698.456 -45.040000000 45.120000000 195.998 -45.040000000 45.200000000 349.228 -45.120000000 45.240000000 698.456 -45.000000000 45.360000000 783.991 -45.240000000 45.520000000 622.254 -45.440000000 45.560000000 1174.66 -45.400000000 45.640000000 587.33 -45.600000000 46.000000000 523.251 -46.360000000 46.480000000 207.652 -46.240000000 46.640000000 622.254 -45.600000000 46.880000000 311.127 -46.920000000 47.120000000 1046.5 -46.880000000 47.320000000 523.251 -47.600000000 47.680000000 261.626 -47.800000000 48.040000000 622.254 -48.160000000 48.280000000 587.33 -48.800000000 49.000000000 587.33 +32.800000000 33.060000000 391.995 +33.140000000 33.340000000 391.995 +33.220000000 33.400000000 97.9989 +33.820000000 33.980000000 97.9989 +34.360000000 34.700000000 97.9989 +34.980000000 35.180000000 783.991 +35.600000000 36.060000000 391.995 +36.280000000 36.400000000 391.995 +36.140000000 36.460000000 195.998 +36.820000000 37.520000000 97.9989 +37.480000000 37.700000000 783.991 +38.120000000 38.620000000 391.995 +38.720000000 38.960000000 195.998 +39.660000000 39.860000000 391.995 +39.280000000 39.920000000 97.9989 +39.820000000 39.960000000 195.998 +39.920000000 40.200000000 440 +40.240000000 40.540000000 493.883 +39.920000000 40.660000000 87.3071 +40.080000000 40.740000000 97.9989 +40.640000000 40.800000000 155.563 +40.580000000 40.980000000 523.251 +40.640000000 41.180000000 77.7817 +41.180000000 41.560000000 622.254 +41.300000000 41.580000000 130.813 +41.820000000 42.180000000 523.251 +41.840000000 42.280000000 1046.5 +42.500000000 42.720000000 261.626 +42.500000000 42.800000000 311.127 +42.760000000 43.020000000 622.254 +43.100000000 43.380000000 587.33 +43.700000000 43.960000000 587.33 +44.660000000 44.880000000 622.254 +44.820000000 44.940000000 698.456 +44.980000000 45.160000000 783.991 +45.260000000 45.460000000 622.254 +45.420000000 45.580000000 587.33 +45.620000000 45.920000000 523.251 +45.620000000 45.940000000 311.127 +46.240000000 46.460000000 622.254 +46.240000000 46.600000000 311.127 +46.900000000 47.220000000 523.251 +47.800000000 48.000000000 622.254 49.760000000 49.960000000 622.254 -49.920000000 50.120000000 698.456 -50.080000000 50.200000000 783.991 -50.360000000 50.600000000 622.254 -50.560000000 50.640000000 587.33 -50.720000000 50.880000000 523.251 -53.880000000 53.960000000 415.305 -53.920000000 54.000000000 369.994 -54.000000000 54.080000000 1396.91 -54.200000000 54.280000000 523.251 +50.360000000 50.580000000 622.254 +50.720000000 50.860000000 523.251
--- a/testdata/TRIOS-silvet/schubert/piano_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/piano_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,302 +1,229 @@ -5.600000000 5.800000000 261.626 -5.760000000 5.920000000 130.813 -5.960000000 6.160000000 130.813 -5.640000000 6.160000000 155.563 -6.320000000 6.400000000 261.626 -6.360000000 6.560000000 130.813 -6.400000000 6.640000000 155.563 -6.720000000 6.800000000 130.813 -6.680000000 6.880000000 155.563 -7.040000000 7.200000000 130.813 -5.600000000 7.320000000 391.995 -7.320000000 7.440000000 130.813 -7.000000000 7.520000000 155.563 -7.760000000 8.080000000 155.563 -7.720000000 8.160000000 130.813 -5.600000000 8.200000000 195.998 -8.200000000 8.360000000 349.228 -8.280000000 8.440000000 130.813 +5.580000000 5.720000000 466.164 +5.580000000 5.780000000 261.626 +5.720000000 5.840000000 391.995 +5.780000000 5.900000000 466.164 +5.880000000 6.180000000 391.995 +5.640000000 6.260000000 130.813 +6.340000000 6.500000000 130.813 +6.220000000 6.660000000 391.995 +5.560000000 6.900000000 155.563 +6.560000000 6.920000000 130.813 +6.680000000 6.920000000 391.995 +7.000000000 7.120000000 130.813 +7.140000000 7.360000000 130.813 +6.980000000 7.480000000 155.563 +7.440000000 7.560000000 130.813 +7.760000000 7.960000000 130.813 +7.800000000 7.980000000 155.563 +7.120000000 8.040000000 391.995 +5.540000000 8.180000000 195.998 8.200000000 8.480000000 415.305 -8.440000000 8.520000000 174.614 8.360000000 8.520000000 932.328 -7.400000000 8.560000000 391.995 +8.160000000 8.600000000 391.995 +8.180000000 8.640000000 523.251 8.520000000 8.680000000 1046.5 -8.160000000 8.760000000 523.251 -8.560000000 8.840000000 130.813 -8.800000000 9.000000000 174.614 -9.000000000 9.120000000 130.813 -8.520000000 9.120000000 349.228 -8.880000000 9.200000000 415.305 -9.120000000 9.240000000 174.614 -9.280000000 9.360000000 415.305 -9.160000000 9.400000000 130.813 -9.200000000 9.400000000 349.228 -9.400000000 9.480000000 174.614 -9.520000000 9.720000000 349.228 -9.480000000 9.760000000 415.305 -9.480000000 9.800000000 130.813 -9.760000000 9.920000000 349.228 -9.720000000 10.080000000 174.614 -10.080000000 10.160000000 932.328 -10.040000000 10.200000000 349.228 -10.040000000 10.280000000 466.164 +8.480000000 8.720000000 207.652 +8.500000000 8.760000000 349.228 +8.600000000 8.820000000 130.813 +8.860000000 8.980000000 207.652 +8.860000000 8.980000000 391.995 +8.900000000 9.020000000 415.305 +8.940000000 9.060000000 130.813 +9.000000000 9.140000000 207.652 +9.100000000 9.240000000 391.995 +9.280000000 9.420000000 130.813 +9.520000000 9.740000000 207.652 +9.520000000 9.780000000 130.813 +9.780000000 9.900000000 391.995 +9.900000000 10.020000000 130.813 +10.040000000 10.200000000 466.164 +10.060000000 10.200000000 932.328 10.160000000 10.320000000 130.813 -10.320000000 10.520000000 174.614 -10.520000000 10.600000000 349.228 -8.680000000 10.640000000 391.995 -10.200000000 10.640000000 415.305 -8.480000000 10.680000000 207.652 -10.760000000 10.880000000 130.813 -11.000000000 11.160000000 130.813 -11.280000000 11.480000000 1244.51 -11.480000000 11.640000000 130.813 -10.720000000 11.720000000 155.563 -11.240000000 11.720000000 622.254 -11.680000000 11.800000000 130.813 -10.640000000 11.840000000 195.998 -11.800000000 11.880000000 155.563 -10.720000000 11.920000000 391.995 -11.920000000 12.040000000 97.9989 -11.880000000 12.240000000 493.883 -12.040000000 12.560000000 1046.5 -11.880000000 12.640000000 987.767 -12.560000000 12.680000000 195.998 -12.680000000 12.800000000 391.995 -12.640000000 12.880000000 174.614 -12.800000000 12.960000000 880 -11.880000000 13.080000000 146.832 -11.880000000 13.080000000 349.228 -12.400000000 13.120000000 97.9989 -12.920000000 13.160000000 987.767 -13.080000000 13.320000000 1046.5 -13.040000000 13.360000000 391.995 -13.280000000 13.600000000 130.813 -13.080000000 13.640000000 523.251 -13.560000000 14.160000000 391.995 -13.800000000 14.200000000 130.813 -13.320000000 14.360000000 155.563 -14.440000000 14.720000000 130.813 -14.520000000 14.840000000 155.563 -15.040000000 15.280000000 466.164 -14.960000000 15.400000000 130.813 -13.160000000 15.440000000 195.998 -15.440000000 15.520000000 415.305 -14.880000000 15.600000000 155.563 -15.520000000 15.600000000 261.626 -15.480000000 15.640000000 207.652 -15.440000000 15.680000000 349.228 -15.720000000 15.800000000 261.626 -15.600000000 15.880000000 1046.5 -15.800000000 16.040000000 130.813 -15.600000000 16.200000000 523.251 -16.400000000 16.640000000 130.813 -16.760000000 16.840000000 130.813 -14.200000000 17.040000000 391.995 -17.000000000 17.120000000 261.626 -17.120000000 17.480000000 130.813 -15.880000000 17.480000000 155.563 -17.080000000 17.720000000 391.995 -17.520000000 17.800000000 1046.5 -15.640000000 18.000000000 195.998 -17.560000000 18.120000000 155.563 -18.120000000 18.400000000 1046.5 -18.120000000 18.560000000 195.998 -17.480000000 18.680000000 523.251 -18.480000000 18.720000000 932.328 -18.800000000 18.880000000 391.995 -18.440000000 18.920000000 466.164 -18.960000000 19.040000000 391.995 -19.440000000 19.520000000 783.991 -19.480000000 19.560000000 391.995 -20.120000000 20.280000000 130.813 -18.200000000 20.520000000 155.563 -20.400000000 20.560000000 130.813 -18.600000000 20.560000000 195.998 -20.640000000 20.720000000 77.7817 -20.680000000 20.880000000 130.813 -20.840000000 21.000000000 261.626 -21.280000000 21.480000000 1244.51 -21.480000000 21.680000000 130.813 -21.320000000 21.760000000 622.254 -20.720000000 21.880000000 155.563 -21.720000000 21.880000000 195.998 -20.600000000 21.920000000 97.9989 -19.640000000 21.920000000 391.995 -21.960000000 22.040000000 440 -21.880000000 22.240000000 493.883 -22.400000000 22.520000000 97.9989 -22.040000000 22.560000000 1046.5 -22.520000000 22.760000000 195.998 -21.920000000 22.840000000 987.767 -22.760000000 22.920000000 174.614 -22.840000000 22.960000000 880 -21.880000000 23.000000000 349.228 -22.960000000 23.080000000 174.614 -23.000000000 23.080000000 195.998 -22.560000000 23.120000000 97.9989 -21.880000000 23.120000000 146.832 -22.920000000 23.200000000 987.767 -23.080000000 23.280000000 391.995 -23.120000000 23.360000000 1046.5 -23.160000000 23.680000000 130.813 -23.080000000 23.680000000 523.251 -23.800000000 23.880000000 261.626 -23.800000000 24.000000000 130.813 -24.040000000 24.320000000 130.813 -24.440000000 24.520000000 261.626 -24.560000000 24.760000000 130.813 -23.360000000 24.840000000 155.563 -23.320000000 24.840000000 391.995 -24.800000000 24.960000000 130.813 -25.000000000 25.120000000 261.626 -25.200000000 25.280000000 466.164 -25.080000000 25.440000000 130.813 -23.200000000 25.480000000 195.998 -25.440000000 25.640000000 349.228 -25.480000000 25.640000000 415.305 -25.440000000 25.720000000 207.652 -25.640000000 25.840000000 622.254 -25.720000000 26.160000000 130.813 -24.920000000 26.200000000 155.563 -26.320000000 26.800000000 130.813 -24.960000000 26.920000000 391.995 -26.880000000 27.080000000 587.33 -26.920000000 27.120000000 1174.66 -25.720000000 27.280000000 195.998 -27.560000000 27.640000000 440 -27.520000000 27.760000000 391.995 -26.920000000 28.120000000 146.832 -26.840000000 28.200000000 116.541 -28.160000000 28.360000000 1174.66 -28.120000000 28.480000000 587.33 -28.200000000 28.960000000 391.995 -29.200000000 29.320000000 391.995 -28.200000000 29.680000000 155.563 -29.760000000 29.840000000 391.995 -30.000000000 30.480000000 391.995 -29.720000000 30.600000000 155.563 -30.680000000 30.840000000 261.626 -30.640000000 30.840000000 391.995 -30.840000000 31.240000000 130.813 -31.280000000 31.400000000 261.626 -31.440000000 32.120000000 130.813 -27.320000000 32.400000000 195.998 -32.240000000 32.440000000 130.813 -31.880000000 32.480000000 440 -32.520000000 32.640000000 184.997 -32.520000000 32.680000000 261.626 -32.600000000 32.880000000 369.994 -32.640000000 32.920000000 130.813 -32.920000000 33.000000000 184.997 -33.160000000 33.240000000 195.998 -33.800000000 33.880000000 195.998 -33.760000000 33.920000000 293.665 -30.920000000 34.040000000 391.995 -34.000000000 34.120000000 195.998 -34.200000000 34.280000000 195.998 -34.280000000 34.680000000 391.995 -34.760000000 34.840000000 391.995 -33.120000000 35.040000000 97.9989 -35.000000000 35.240000000 783.991 -35.560000000 35.960000000 391.995 -36.200000000 36.360000000 391.995 -36.160000000 36.840000000 195.998 -36.800000000 37.520000000 97.9989 -37.480000000 37.800000000 783.991 -38.080000000 38.520000000 391.995 -38.720000000 38.840000000 391.995 -39.040000000 39.120000000 391.995 -38.720000000 39.440000000 195.998 -39.640000000 39.920000000 391.995 -39.960000000 40.280000000 440 +10.340000000 10.640000000 415.305 +10.720000000 10.840000000 130.813 +10.660000000 11.040000000 195.998 +11.020000000 11.160000000 130.813 +11.220000000 11.360000000 391.995 +11.360000000 11.520000000 130.813 +11.260000000 11.540000000 622.254 +11.300000000 11.700000000 195.998 +11.900000000 12.100000000 987.767 +11.880000000 12.160000000 493.883 +11.920000000 12.380000000 146.832 +11.920000000 12.380000000 349.228 +12.060000000 12.500000000 1046.5 +12.140000000 12.640000000 987.767 +12.460000000 12.740000000 349.228 +12.580000000 12.760000000 97.9989 +12.880000000 13.000000000 97.9989 +12.920000000 13.100000000 987.767 +13.120000000 13.240000000 1046.5 +13.080000000 13.260000000 523.251 +13.200000000 13.360000000 130.813 +13.400000000 13.520000000 130.813 +13.720000000 13.840000000 195.998 +14.360000000 14.600000000 195.998 +14.960000000 15.100000000 391.995 +15.000000000 15.280000000 195.998 +15.200000000 15.340000000 130.813 +15.600000000 15.720000000 391.995 +15.620000000 15.780000000 523.251 +15.720000000 15.860000000 195.998 +15.780000000 15.960000000 130.813 +16.300000000 16.560000000 195.998 +16.980000000 17.100000000 130.813 +17.140000000 17.260000000 130.813 +16.900000000 17.280000000 195.998 +17.340000000 17.460000000 130.813 +17.500000000 17.680000000 1046.5 +17.500000000 17.780000000 195.998 +17.500000000 17.900000000 523.251 +18.120000000 18.300000000 1046.5 +18.140000000 18.460000000 195.998 +18.120000000 18.480000000 523.251 +18.480000000 18.600000000 932.328 +18.460000000 18.700000000 466.164 +18.800000000 19.180000000 195.998 +19.440000000 19.840000000 195.998 +19.900000000 20.300000000 195.998 +20.240000000 20.360000000 130.813 +20.200000000 20.360000000 391.995 +20.320000000 20.520000000 195.998 +20.440000000 20.580000000 130.813 +20.740000000 20.880000000 130.813 +20.820000000 20.940000000 391.995 +20.660000000 20.980000000 97.9989 +21.020000000 21.180000000 130.813 +21.000000000 21.320000000 97.9989 +21.240000000 21.360000000 391.995 +21.280000000 21.420000000 195.998 +21.260000000 21.520000000 622.254 +21.420000000 21.540000000 155.563 +21.360000000 21.640000000 130.813 +21.380000000 21.840000000 391.995 +21.380000000 21.980000000 97.9989 +21.900000000 22.080000000 987.767 +21.880000000 22.180000000 493.883 +21.900000000 22.340000000 349.228 +22.060000000 22.380000000 1046.5 +21.940000000 22.440000000 146.832 +22.560000000 22.680000000 195.998 +22.480000000 22.720000000 349.228 +22.120000000 22.720000000 987.767 +22.640000000 22.760000000 146.832 +22.740000000 22.860000000 349.228 +22.740000000 22.920000000 97.9989 +22.940000000 23.120000000 987.767 +23.120000000 23.240000000 1046.5 +23.080000000 23.300000000 523.251 +23.780000000 23.900000000 195.998 +24.080000000 24.200000000 130.813 +24.400000000 24.600000000 195.998 +25.020000000 25.180000000 391.995 +25.020000000 25.320000000 195.998 +25.300000000 25.420000000 130.813 +25.620000000 25.740000000 391.995 +25.660000000 25.800000000 622.254 +26.320000000 26.440000000 195.998 +26.560000000 26.680000000 195.998 +26.900000000 27.060000000 587.33 +26.900000000 27.080000000 1174.66 +26.920000000 27.160000000 195.998 +27.120000000 27.240000000 116.541 +27.580000000 27.800000000 195.998 +27.540000000 27.960000000 116.541 +28.140000000 28.260000000 587.33 +28.180000000 28.480000000 195.998 +28.540000000 28.660000000 195.998 +28.480000000 28.820000000 391.995 +28.840000000 29.140000000 195.998 +29.180000000 29.300000000 195.998 +29.400000000 29.800000000 195.998 +30.720000000 30.840000000 130.813 +30.920000000 31.040000000 391.995 +31.020000000 31.240000000 130.813 +31.280000000 31.400000000 130.813 +31.240000000 31.400000000 391.995 +31.860000000 31.980000000 391.995 +32.020000000 32.160000000 391.995 +32.080000000 32.240000000 130.813 +31.860000000 32.260000000 440 +32.240000000 32.460000000 391.995 +29.860000000 32.500000000 195.998 +32.520000000 32.700000000 130.813 +32.800000000 32.940000000 130.813 +32.500000000 33.240000000 391.995 +33.280000000 33.400000000 391.995 +33.140000000 33.580000000 97.9989 +33.600000000 33.760000000 97.9989 +33.540000000 33.800000000 195.998 +34.380000000 34.500000000 195.998 +33.780000000 34.900000000 97.9989 +34.980000000 35.220000000 783.991 +35.580000000 35.900000000 391.995 +36.180000000 36.860000000 195.998 +36.820000000 37.540000000 97.9989 +37.480000000 37.820000000 783.991 +38.100000000 38.540000000 391.995 +39.020000000 39.140000000 391.995 +38.720000000 39.420000000 195.998 +39.640000000 39.940000000 391.995 +39.940000000 40.260000000 440 40.240000000 40.560000000 493.883 -39.320000000 40.640000000 97.9989 -39.920000000 40.720000000 87.3071 +39.300000000 40.620000000 97.9989 +39.920000000 40.660000000 87.3071 40.600000000 41.120000000 523.251 -40.560000000 41.200000000 77.7817 -41.200000000 41.320000000 1244.51 -41.160000000 41.520000000 622.254 -41.320000000 41.640000000 261.626 -41.160000000 42.000000000 391.995 -41.280000000 42.040000000 130.813 -41.840000000 42.080000000 1046.5 -42.040000000 42.160000000 391.995 -42.000000000 42.200000000 261.626 -42.080000000 42.280000000 130.813 -41.800000000 42.360000000 523.251 -42.280000000 42.400000000 261.626 -41.200000000 42.480000000 195.998 -42.240000000 42.480000000 391.995 -42.480000000 42.800000000 155.563 -42.480000000 42.920000000 261.626 -42.800000000 43.000000000 622.254 -42.880000000 43.080000000 155.563 -43.080000000 43.240000000 349.228 -43.160000000 43.400000000 261.626 -43.080000000 43.480000000 587.33 -43.440000000 43.560000000 349.228 -43.720000000 43.800000000 523.251 -43.640000000 43.880000000 349.228 -43.200000000 44.000000000 174.614 -43.680000000 44.080000000 587.33 -43.760000000 44.160000000 261.626 -43.920000000 44.280000000 349.228 -44.040000000 44.360000000 174.614 -44.360000000 44.680000000 391.995 -44.680000000 44.960000000 622.254 -44.800000000 45.000000000 698.456 -45.000000000 45.160000000 391.995 -45.040000000 45.200000000 493.883 -45.280000000 45.520000000 622.254 -44.960000000 45.560000000 349.228 -44.360000000 45.600000000 246.942 -44.320000000 45.640000000 195.998 -45.400000000 45.680000000 587.33 -45.640000000 45.960000000 415.305 -45.600000000 46.200000000 311.127 -45.640000000 46.440000000 523.251 -46.240000000 46.520000000 1244.51 -46.480000000 46.600000000 523.251 -46.520000000 46.600000000 622.254 -46.400000000 46.680000000 415.305 -45.600000000 46.800000000 261.626 -45.680000000 46.880000000 207.652 -46.880000000 47.200000000 1046.5 -46.840000000 47.400000000 261.626 -47.480000000 47.680000000 391.995 -46.880000000 47.680000000 523.251 -47.680000000 47.800000000 466.164 -46.880000000 48.000000000 195.998 -47.480000000 48.000000000 261.626 -47.800000000 48.040000000 622.254 -46.880000000 48.160000000 155.563 -48.360000000 48.520000000 523.251 -48.120000000 48.560000000 587.33 -48.080000000 48.720000000 261.626 -48.240000000 48.800000000 174.614 -48.800000000 48.880000000 523.251 -48.760000000 49.080000000 261.626 -48.120000000 49.160000000 349.228 -48.760000000 49.160000000 587.33 -48.880000000 49.400000000 174.614 -49.440000000 49.560000000 391.995 -49.760000000 49.920000000 622.254 -49.400000000 49.960000000 195.998 -49.400000000 49.960000000 246.942 -49.920000000 50.040000000 698.456 -50.040000000 50.160000000 195.998 -50.080000000 50.240000000 783.991 -50.240000000 50.360000000 698.456 -50.480000000 50.560000000 293.665 -50.360000000 50.560000000 622.254 -50.000000000 50.720000000 97.9989 -50.680000000 50.760000000 293.665 -50.520000000 50.880000000 587.33 -50.680000000 51.280000000 523.251 -50.640000000 51.440000000 103.826 -54.120000000 54.200000000 1108.73 -54.240000000 54.320000000 554.365 -54.240000000 54.320000000 659.255 -54.240000000 54.320000000 739.989 -54.280000000 54.360000000 1661.22 -54.280000000 54.360000000 1760 +40.580000000 41.160000000 77.7817 +41.180000000 41.300000000 1244.51 +41.180000000 41.500000000 622.254 +41.480000000 41.600000000 130.813 +41.180000000 41.800000000 195.998 +41.780000000 41.900000000 391.995 +41.820000000 42.020000000 1046.5 +41.820000000 42.260000000 523.251 +41.860000000 42.280000000 130.813 +41.820000000 42.360000000 195.998 +43.080000000 43.380000000 587.33 +43.380000000 43.500000000 174.614 +43.560000000 43.720000000 174.614 +43.720000000 43.840000000 349.228 +43.680000000 43.940000000 587.33 +43.840000000 44.020000000 174.614 +44.380000000 44.660000000 246.942 +44.360000000 44.700000000 195.998 +44.820000000 44.940000000 698.456 +44.960000000 45.400000000 349.228 +45.280000000 45.400000000 622.254 +45.020000000 45.420000000 246.942 +45.020000000 45.560000000 195.998 +45.400000000 45.640000000 587.33 +45.640000000 45.900000000 311.127 +45.620000000 45.900000000 415.305 +45.620000000 45.980000000 261.626 +45.620000000 46.160000000 523.251 +46.260000000 46.420000000 415.305 +46.260000000 46.640000000 261.626 +45.620000000 46.860000000 207.652 +46.980000000 47.120000000 1046.5 +46.900000000 47.180000000 261.626 +46.900000000 47.300000000 523.251 +47.040000000 47.380000000 155.563 +46.880000000 47.440000000 195.998 +47.320000000 47.460000000 523.251 +47.520000000 47.700000000 155.563 +47.580000000 47.820000000 261.626 +47.520000000 48.000000000 195.998 +48.140000000 48.260000000 349.228 +48.160000000 48.460000000 261.626 +48.120000000 48.460000000 587.33 +48.380000000 48.560000000 174.614 +48.600000000 48.780000000 174.614 +48.840000000 48.960000000 174.614 +48.780000000 49.020000000 587.33 +49.000000000 49.200000000 174.614 +49.260000000 49.380000000 174.614 +49.460000000 49.740000000 195.998 +50.160000000 50.600000000 97.9989 +50.520000000 50.680000000 587.33 +50.700000000 51.100000000 103.826 +50.700000000 51.100000000 523.251
--- a/testdata/TRIOS-silvet/schubert/violin.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/violin.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,149 +1,113 @@ -0.600000000 .800000000 391.995 -0.680000000 .840000000 195.998 -1.280000000 1.360000000 195.998 -1.280000000 1.360000000 311.127 -1.320000000 1.480000000 391.995 -1.880000000 2.120000000 391.995 -1.880000000 2.160000000 195.998 -2.520000000 2.920000000 311.127 -2.720000000 2.920000000 932.328 -2.520000000 2.960000000 195.998 -2.480000000 3.040000000 391.995 -3.000000000 3.080000000 207.652 -3.040000000 3.160000000 349.228 -3.000000000 3.200000000 415.305 -3.200000000 3.280000000 932.328 -3.240000000 3.320000000 987.767 -3.240000000 3.400000000 195.998 -3.160000000 3.400000000 311.127 -3.240000000 3.440000000 391.995 -3.800000000 3.960000000 311.127 -3.880000000 3.960000000 932.328 -3.840000000 3.960000000 987.767 -3.920000000 4.040000000 195.998 -3.840000000 4.040000000 391.995 -4.400000000 4.480000000 195.998 -4.440000000 4.560000000 932.328 -4.400000000 4.600000000 311.127 -4.400000000 4.640000000 391.995 -5.000000000 5.280000000 311.127 -5.160000000 5.280000000 987.767 -5.040000000 5.360000000 932.328 -5.080000000 5.440000000 195.998 -5.000000000 5.480000000 391.995 -5.520000000 5.600000000 349.228 -5.440000000 5.600000000 415.305 -5.520000000 5.600000000 622.254 -5.480000000 5.640000000 207.652 -5.640000000 5.800000000 987.767 -5.680000000 5.880000000 311.127 -5.600000000 5.920000000 391.995 -5.680000000 6.000000000 195.998 -6.400000000 6.680000000 987.767 -6.560000000 6.880000000 1396.91 -6.400000000 6.920000000 195.998 -6.280000000 6.920000000 391.995 -6.840000000 7.040000000 622.254 -6.920000000 7.360000000 932.328 -7.280000000 7.360000000 987.767 -7.120000000 7.480000000 622.254 -7.400000000 7.560000000 932.328 -7.400000000 7.560000000 1244.51 -7.600000000 7.840000000 622.254 -7.800000000 7.880000000 932.328 -6.840000000 8.120000000 311.127 -11.360000000 11.480000000 987.767 -11.600000000 11.680000000 783.991 -11.600000000 11.720000000 987.767 -11.680000000 11.760000000 1244.51 -11.760000000 11.840000000 783.991 +0.540000000 .740000000 311.127 +0.560000000 .860000000 391.995 +0.740000000 .860000000 587.33 +0.540000000 .960000000 195.998 +1.280000000 1.400000000 622.254 +1.260000000 1.420000000 311.127 +1.240000000 1.440000000 195.998 +1.300000000 1.520000000 391.995 +1.860000000 2.160000000 391.995 +1.880000000 2.240000000 195.998 +2.680000000 2.800000000 622.254 +2.480000000 2.860000000 311.127 +2.700000000 2.920000000 932.328 +2.500000000 2.960000000 195.998 +2.480000000 3.020000000 391.995 +3.000000000 3.140000000 207.652 +3.020000000 3.180000000 349.228 +2.980000000 3.180000000 415.305 +3.200000000 3.320000000 932.328 +3.180000000 3.400000000 311.127 +3.180000000 3.460000000 391.995 +3.820000000 3.940000000 311.127 +3.840000000 3.980000000 391.995 +3.840000000 4.040000000 195.998 +4.400000000 4.560000000 311.127 +4.420000000 4.600000000 391.995 +4.380000000 4.660000000 195.998 +5.000000000 5.140000000 195.998 +5.020000000 5.140000000 932.328 +5.040000000 5.240000000 311.127 +5.120000000 5.260000000 987.767 +5.180000000 5.360000000 932.328 +5.180000000 5.400000000 195.998 +5.000000000 5.460000000 391.995 +5.460000000 5.600000000 207.652 +5.460000000 5.600000000 415.305 +5.660000000 5.820000000 311.127 +5.600000000 5.820000000 391.995 +5.640000000 5.880000000 195.998 +6.440000000 6.680000000 987.767 +6.380000000 6.860000000 195.998 +6.320000000 6.920000000 391.995 +6.880000000 7.140000000 932.328 +7.100000000 7.280000000 622.254 +7.160000000 7.340000000 932.328 +7.420000000 7.540000000 622.254 +6.880000000 7.920000000 311.127 +11.460000000 11.620000000 987.767 11.240000000 12.040000000 391.995 -11.280000000 12.080000000 195.998 -11.960000000 12.480000000 1244.51 -12.240000000 12.520000000 830.609 -11.920000000 12.640000000 415.305 -12.560000000 12.800000000 783.991 -12.840000000 12.920000000 698.456 -12.440000000 13.040000000 391.995 -13.000000000 13.160000000 1046.5 -12.800000000 13.240000000 349.228 -13.320000000 13.400000000 1244.51 -13.200000000 13.760000000 622.254 -13.760000000 13.840000000 1244.51 -13.880000000 14.080000000 622.254 -13.200000000 14.080000000 932.328 -13.160000000 14.240000000 311.127 -16.400000000 16.680000000 195.998 -16.560000000 16.880000000 987.767 -16.640000000 16.880000000 1396.91 -16.720000000 16.920000000 195.998 -16.280000000 17.000000000 391.995 -16.920000000 17.080000000 622.254 -17.160000000 17.280000000 622.254 -17.240000000 17.360000000 1244.51 -17.000000000 17.600000000 932.328 -17.320000000 17.840000000 622.254 -16.960000000 18.040000000 311.127 -21.600000000 21.720000000 987.767 -21.760000000 21.840000000 1396.91 -21.440000000 21.920000000 195.998 -21.320000000 21.920000000 391.995 -22.440000000 22.520000000 329.628 -21.880000000 22.560000000 349.228 -22.520000000 22.760000000 622.254 -22.520000000 22.760000000 932.328 -22.440000000 22.840000000 311.127 -22.680000000 23.280000000 293.665 -23.120000000 23.320000000 523.251 -23.440000000 23.760000000 523.251 -23.280000000 23.840000000 783.991 -23.160000000 24.080000000 261.626 -26.720000000 26.920000000 987.767 -26.280000000 27.040000000 195.998 -26.960000000 27.040000000 783.991 -27.120000000 27.280000000 783.991 -27.400000000 27.480000000 1396.91 -27.400000000 27.520000000 783.991 -27.640000000 27.960000000 783.991 -26.280000000 28.200000000 391.995 -31.480000000 31.600000000 523.251 -31.520000000 31.920000000 261.626 -31.920000000 32.040000000 622.254 -32.160000000 32.320000000 622.254 -32.280000000 32.480000000 932.328 -32.520000000 32.640000000 932.328 -32.560000000 32.720000000 622.254 -33.000000000 33.120000000 622.254 -31.920000000 33.240000000 311.127 -33.080000000 35.960000000 293.665 -36.200000000 36.480000000 311.127 -36.640000000 36.760000000 311.127 -36.840000000 38.640000000 293.665 -38.760000000 38.840000000 932.328 -38.760000000 38.880000000 622.254 -38.800000000 38.920000000 1244.51 -38.720000000 39.000000000 311.127 -39.320000000 40.720000000 293.665 -40.680000000 41.000000000 311.127 -44.640000000 45.080000000 391.995 +11.300000000 12.060000000 195.998 +12.120000000 12.340000000 1244.51 +11.920000000 12.580000000 415.305 +12.620000000 12.780000000 783.991 +12.460000000 12.920000000 391.995 +12.820000000 13.200000000 349.228 +13.300000000 13.500000000 622.254 +13.200000000 13.640000000 932.328 +13.240000000 13.940000000 311.127 +16.440000000 16.940000000 195.998 +16.360000000 16.960000000 391.995 +17.040000000 17.160000000 622.254 +17.020000000 17.360000000 932.328 +17.300000000 17.420000000 622.254 +17.480000000 17.640000000 622.254 +16.980000000 18.020000000 311.127 +21.320000000 21.540000000 391.995 +21.580000000 21.760000000 987.767 +21.700000000 21.820000000 1396.91 +21.580000000 21.900000000 391.995 +21.400000000 21.940000000 195.998 +21.860000000 22.540000000 349.228 +22.480000000 22.720000000 932.328 +22.640000000 22.760000000 622.254 +22.500000000 22.800000000 311.127 +22.680000000 23.200000000 293.665 +23.320000000 23.440000000 783.991 +23.360000000 23.640000000 523.251 +23.160000000 23.860000000 261.626 +26.440000000 27.040000000 195.998 +27.220000000 27.420000000 783.991 +27.440000000 27.760000000 783.991 +26.340000000 28.120000000 391.995 +31.540000000 31.900000000 261.626 +31.860000000 31.980000000 277.183 +31.940000000 32.120000000 622.254 +32.240000000 32.440000000 932.328 +32.340000000 32.580000000 622.254 +32.640000000 32.780000000 932.328 +32.680000000 32.940000000 622.254 +31.880000000 33.200000000 311.127 +33.100000000 35.940000000 293.665 +36.220000000 36.520000000 311.127 +37.480000000 37.600000000 587.33 +36.820000000 38.600000000 293.665 +38.740000000 38.900000000 622.254 +38.720000000 38.960000000 311.127 +39.360000000 40.680000000 293.665 +40.660000000 40.880000000 311.127 +44.620000000 45.140000000 391.995 44.960000000 45.320000000 440 -45.360000000 45.440000000 523.251 -45.400000000 45.520000000 987.767 -45.320000000 45.640000000 493.883 -46.120000000 46.440000000 1046.5 -46.720000000 46.800000000 1567.98 -46.720000000 46.880000000 1046.5 -45.640000000 47.000000000 523.251 -46.920000000 47.520000000 1244.51 -46.920000000 47.600000000 622.254 -47.600000000 47.800000000 523.251 -47.840000000 47.920000000 554.365 -49.680000000 49.920000000 783.991 -50.040000000 50.280000000 880 -50.280000000 50.560000000 987.767 -50.840000000 50.920000000 523.251 -50.640000000 51.440000000 1046.5 -54.200000000 54.320000000 554.365 -54.280000000 54.360000000 622.254 -54.280000000 54.360000000 1396.91 -54.280000000 54.360000000 1760 +45.380000000 45.500000000 987.767 +45.320000000 45.600000000 493.883 +45.900000000 46.020000000 1046.5 +45.720000000 46.500000000 523.251 +46.540000000 46.980000000 523.251 +47.300000000 47.420000000 1244.51 +46.920000000 47.560000000 622.254 +47.580000000 47.700000000 523.251 +49.680000000 49.880000000 783.991 +50.040000000 50.220000000 880 +50.280000000 50.460000000 987.767 +50.420000000 50.540000000 1046.5 +50.640000000 51.420000000 1046.5
--- a/testdata/TRIOS-silvet/schubert/violin_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/schubert/violin_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,207 +1,113 @@ -0.680000000 1.000000000 195.998 -0.680000000 1.040000000 391.995 -0.800000000 1.040000000 987.767 -0.720000000 1.080000000 622.254 -1.080000000 1.200000000 987.767 -1.080000000 1.240000000 391.995 -1.280000000 1.440000000 987.767 -1.440000000 1.560000000 195.998 -1.360000000 1.600000000 391.995 +0.580000000 .700000000 987.767 +0.580000000 .740000000 932.328 +0.600000000 .900000000 195.998 +0.780000000 1.000000000 932.328 +0.740000000 1.020000000 987.767 +1.020000000 1.140000000 932.328 +0.920000000 1.200000000 195.998 +0.560000000 1.240000000 391.995 +1.080000000 1.240000000 987.767 +1.280000000 1.420000000 987.767 +1.320000000 1.440000000 391.995 +1.420000000 1.600000000 195.998 1.560000000 1.680000000 987.767 -1.520000000 1.720000000 622.254 -1.680000000 1.800000000 932.328 -1.720000000 1.800000000 987.767 -1.640000000 1.840000000 391.995 -1.760000000 1.880000000 195.998 -1.920000000 2.000000000 622.254 -1.960000000 2.080000000 987.767 -2.080000000 2.200000000 622.254 -2.080000000 2.320000000 195.998 -2.280000000 2.360000000 932.328 -2.160000000 2.400000000 987.767 -2.320000000 2.440000000 622.254 -2.520000000 2.680000000 622.254 -2.560000000 3.040000000 195.998 -2.680000000 3.080000000 932.328 -2.560000000 3.080000000 987.767 -1.880000000 3.120000000 391.995 -3.040000000 3.160000000 622.254 -3.080000000 3.160000000 1046.5 -3.080000000 3.200000000 415.305 -3.120000000 3.240000000 349.228 -3.240000000 3.320000000 391.995 -3.240000000 3.320000000 987.767 -3.280000000 3.560000000 622.254 -3.400000000 3.640000000 987.767 -3.320000000 3.720000000 195.998 -3.640000000 3.720000000 622.254 -3.600000000 3.760000000 932.328 -3.400000000 3.800000000 391.995 -3.720000000 3.960000000 987.767 -4.120000000 4.280000000 987.767 -4.240000000 4.360000000 622.254 -3.960000000 4.400000000 195.998 -4.600000000 4.920000000 195.998 -4.600000000 4.920000000 622.254 -4.400000000 5.000000000 987.767 -5.000000000 5.160000000 932.328 -5.080000000 5.200000000 195.998 -5.200000000 5.280000000 1760 -5.160000000 5.320000000 622.254 -5.280000000 5.360000000 195.998 -5.320000000 5.440000000 932.328 -5.360000000 5.520000000 622.254 -5.080000000 5.520000000 987.767 -3.880000000 5.560000000 391.995 -5.520000000 5.600000000 1046.5 -5.520000000 5.640000000 415.305 -5.520000000 5.680000000 349.228 -5.760000000 5.880000000 622.254 -5.840000000 5.920000000 932.328 -5.880000000 6.240000000 195.998 -5.680000000 6.240000000 391.995 -6.040000000 6.240000000 932.328 -5.640000000 6.240000000 987.767 -0.600000000 6.320000000 311.127 -6.320000000 6.520000000 391.995 -6.320000000 6.520000000 987.767 -6.560000000 6.680000000 391.995 -6.600000000 6.720000000 987.767 -6.800000000 6.880000000 987.767 -6.400000000 6.920000000 195.998 -6.760000000 6.920000000 391.995 -6.920000000 7.040000000 622.254 -7.000000000 7.080000000 932.328 -7.360000000 7.440000000 1108.73 -7.120000000 7.480000000 622.254 -7.520000000 7.600000000 1567.98 -7.600000000 8.360000000 622.254 -7.160000000 8.360000000 932.328 -6.840000000 8.520000000 311.127 -11.280000000 11.760000000 391.995 -11.240000000 11.760000000 987.767 -11.360000000 11.960000000 195.998 -11.880000000 12.040000000 987.767 -12.000000000 12.080000000 195.998 -11.880000000 12.120000000 391.995 -11.960000000 12.400000000 830.609 -12.120000000 12.480000000 1661.22 -12.360000000 12.520000000 1244.51 -11.920000000 12.640000000 415.305 -12.560000000 12.880000000 783.991 -12.480000000 12.960000000 391.995 -13.120000000 13.240000000 1244.51 -12.800000000 13.280000000 349.228 -13.280000000 13.520000000 622.254 -13.480000000 13.640000000 932.328 -13.600000000 14.280000000 622.254 -14.400000000 14.520000000 622.254 -13.680000000 14.520000000 932.328 -13.160000000 14.600000000 311.127 -16.280000000 16.440000000 987.767 -16.320000000 16.680000000 195.998 -16.720000000 16.920000000 195.998 -16.280000000 16.960000000 391.995 -16.560000000 17.000000000 987.767 -16.960000000 17.040000000 1567.98 -17.000000000 17.280000000 622.254 -17.360000000 17.840000000 622.254 -17.760000000 17.840000000 1108.73 -17.880000000 18.400000000 622.254 -16.960000000 18.400000000 932.328 -16.880000000 18.520000000 311.127 -21.280000000 21.440000000 391.995 -21.280000000 21.480000000 987.767 -21.600000000 21.720000000 987.767 -21.320000000 21.920000000 195.998 -21.800000000 21.920000000 987.767 -21.520000000 21.960000000 391.995 -21.880000000 21.960000000 1244.51 -21.920000000 22.000000000 1046.5 -22.320000000 22.440000000 698.456 -22.120000000 22.440000000 1244.51 -22.320000000 22.440000000 1396.91 -22.240000000 22.480000000 1046.5 -21.840000000 22.600000000 349.228 -22.680000000 22.760000000 739.989 -22.520000000 22.800000000 932.328 -22.520000000 22.840000000 622.254 -22.440000000 22.880000000 311.127 -22.720000000 23.280000000 293.665 -23.160000000 23.320000000 523.251 -23.200000000 23.320000000 783.991 -23.360000000 23.480000000 783.991 -23.600000000 23.760000000 783.991 -23.320000000 23.760000000 1046.5 -23.800000000 23.960000000 1046.5 -24.120000000 24.320000000 1046.5 -23.440000000 24.440000000 523.251 -23.240000000 24.480000000 261.626 -26.280000000 26.480000000 987.767 -26.280000000 26.920000000 195.998 -26.560000000 27.000000000 987.767 -26.880000000 27.280000000 783.991 -27.360000000 27.520000000 783.991 -28.200000000 28.280000000 415.305 -28.160000000 28.280000000 987.767 -27.640000000 28.320000000 783.991 -28.360000000 28.600000000 783.991 -26.360000000 28.680000000 391.995 -31.200000000 31.360000000 783.991 -31.600000000 31.680000000 783.991 -31.560000000 31.720000000 1046.5 -31.200000000 32.080000000 261.626 -31.200000000 32.080000000 523.251 -32.160000000 32.280000000 622.254 -32.520000000 32.960000000 622.254 -33.000000000 33.160000000 622.254 -32.440000000 33.200000000 932.328 -31.920000000 33.280000000 311.127 -33.120000000 36.320000000 293.665 -36.320000000 36.760000000 932.328 -36.360000000 36.800000000 622.254 -36.240000000 36.920000000 311.127 -36.840000000 38.800000000 293.665 -38.760000000 38.880000000 932.328 -38.760000000 39.200000000 622.254 -38.960000000 39.200000000 932.328 -38.720000000 39.280000000 311.127 -39.240000000 40.800000000 293.665 -40.800000000 40.920000000 622.254 -40.800000000 40.920000000 932.328 -41.000000000 41.360000000 932.328 -41.040000000 41.400000000 622.254 -40.680000000 41.520000000 311.127 +1.560000000 1.740000000 391.995 +2.200000000 2.360000000 391.995 +2.040000000 2.420000000 195.998 +2.700000000 2.880000000 622.254 +2.640000000 2.960000000 195.998 +2.840000000 3.060000000 391.995 +2.580000000 3.060000000 987.767 +0.540000000 3.120000000 311.127 +3.560000000 3.680000000 195.998 +3.240000000 3.820000000 311.127 +4.540000000 4.660000000 195.998 +5.060000000 5.180000000 195.998 +5.200000000 5.320000000 195.998 +5.260000000 5.380000000 932.328 +5.140000000 5.420000000 391.995 +5.080000000 5.500000000 987.767 +3.860000000 5.560000000 311.127 +5.760000000 6.280000000 311.127 +6.420000000 6.560000000 195.998 +6.660000000 6.880000000 195.998 +6.940000000 7.060000000 622.254 +7.200000000 7.340000000 622.254 +7.280000000 7.540000000 932.328 +7.580000000 7.700000000 932.328 +7.640000000 7.820000000 622.254 +7.760000000 7.880000000 932.328 +7.980000000 8.220000000 932.328 +6.880000000 8.420000000 311.127 +11.340000000 11.540000000 195.998 +11.820000000 12.040000000 195.998 +12.180000000 12.320000000 1661.22 +12.420000000 12.540000000 830.609 +12.420000000 12.540000000 1244.51 +11.920000000 12.600000000 415.305 +12.500000000 12.880000000 783.991 +12.480000000 12.940000000 391.995 +12.900000000 13.040000000 1046.5 +12.820000000 13.260000000 349.228 +13.200000000 14.560000000 311.127 +16.500000000 16.940000000 195.998 +17.160000000 17.340000000 622.254 +17.160000000 17.540000000 932.328 +17.380000000 17.680000000 622.254 +17.640000000 17.760000000 932.328 +17.800000000 17.920000000 932.328 +17.920000000 18.040000000 622.254 +18.060000000 18.320000000 622.254 +18.120000000 18.320000000 932.328 +16.920000000 18.460000000 311.127 +21.480000000 21.860000000 195.998 +21.980000000 22.100000000 1046.5 +21.860000000 22.600000000 349.228 +22.580000000 22.800000000 622.254 +22.720000000 22.840000000 932.328 +22.460000000 22.860000000 311.127 +22.740000000 23.240000000 293.665 +23.260000000 23.380000000 523.251 +23.560000000 23.820000000 523.251 +23.860000000 24.100000000 523.251 +24.120000000 24.320000000 523.251 +23.300000000 24.400000000 261.626 +26.360000000 26.520000000 195.998 +26.680000000 26.880000000 195.998 +26.900000000 27.120000000 783.991 +27.320000000 27.500000000 783.991 +27.560000000 27.720000000 783.991 +28.020000000 28.140000000 783.991 +26.920000000 28.620000000 391.995 +31.300000000 31.540000000 523.251 +31.720000000 31.960000000 523.251 +31.340000000 32.060000000 261.626 +32.460000000 32.580000000 932.328 +32.700000000 32.980000000 932.328 +31.940000000 33.240000000 311.127 +33.140000000 36.260000000 293.665 +36.480000000 36.600000000 622.254 +36.620000000 36.760000000 932.328 +36.240000000 36.840000000 311.127 +36.880000000 38.760000000 293.665 +38.940000000 39.060000000 622.254 +38.720000000 39.240000000 311.127 +39.280000000 40.740000000 293.665 +40.680000000 41.440000000 311.127 44.840000000 45.040000000 783.991 -44.720000000 45.080000000 391.995 -45.040000000 45.360000000 440 -45.320000000 45.560000000 987.767 -45.320000000 45.760000000 493.883 -45.720000000 45.840000000 1567.98 -45.720000000 45.920000000 1046.5 -46.080000000 46.600000000 1046.5 -46.720000000 47.080000000 1046.5 -45.640000000 47.120000000 523.251 -47.040000000 47.560000000 1244.51 -46.920000000 47.680000000 622.254 -47.600000000 47.680000000 1567.98 -47.560000000 47.920000000 1046.5 -48.040000000 48.160000000 1046.5 -47.520000000 48.280000000 523.251 -49.800000000 50.000000000 1567.98 -49.680000000 50.080000000 783.991 -50.000000000 50.400000000 880 -50.280000000 50.720000000 987.767 -50.640000000 51.760000000 1046.5 -53.800000000 53.880000000 415.305 -53.800000000 53.920000000 554.365 -53.960000000 54.040000000 207.652 -53.960000000 54.040000000 277.183 -53.920000000 54.040000000 329.628 -53.920000000 54.040000000 415.305 -53.960000000 54.040000000 830.609 -54.200000000 54.280000000 415.305 -54.200000000 54.280000000 554.365 -54.160000000 54.280000000 659.255 -54.200000000 54.280000000 1661.22 -54.400000000 54.480000000 466.164 +44.700000000 45.100000000 391.995 +45.020000000 45.360000000 440 +45.360000000 45.540000000 987.767 +45.280000000 45.740000000 493.883 +45.740000000 46.060000000 1046.5 +46.460000000 46.620000000 1046.5 +46.720000000 46.900000000 1046.5 +45.620000000 47.040000000 523.251 +46.920000000 47.100000000 1244.51 +46.920000000 47.640000000 622.254 +47.760000000 47.960000000 1046.5 +47.540000000 48.280000000 523.251 +49.780000000 50.020000000 783.991 +50.060000000 50.340000000 880 +50.300000000 50.680000000 987.767 +50.660000000 51.720000000 1046.5
--- a/testdata/TRIOS-silvet/take_five/kick.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/kick.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,3 +1,10 @@ -7.360000000 7.440000000 87.3071 -10.640000000 10.800000000 87.3071 -27.360000000 27.440000000 87.3071 +7.340000000 7.480000000 87.3071 +9.000000000 9.120000000 87.3071 +10.640000000 10.820000000 87.3071 +12.280000000 12.400000000 146.832 +20.660000000 20.780000000 87.3071 +25.660000000 25.800000000 87.3071 +27.340000000 27.500000000 87.3071 +29.020000000 29.180000000 87.3071 +30.660000000 30.800000000 87.3071 +34.020000000 34.140000000 87.3071
--- a/testdata/TRIOS-silvet/take_five/kick_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/kick_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,46 +0,0 @@ -0.600000000 .840000000 69.2957 -0.800000000 .880000000 92.4986 -2.240000000 2.440000000 69.2957 -2.480000000 2.600000000 69.2957 -4.040000000 4.160000000 69.2957 -3.960000000 4.240000000 92.4986 -5.480000000 5.600000000 69.2957 -5.640000000 5.720000000 92.4986 -5.640000000 5.800000000 69.2957 -7.360000000 7.440000000 92.4986 -7.280000000 7.480000000 69.2957 -8.960000000 9.200000000 69.2957 -10.640000000 10.720000000 97.9989 -10.560000000 10.880000000 69.2957 -12.240000000 12.360000000 92.4986 -12.200000000 12.520000000 69.2957 -12.440000000 12.520000000 92.4986 -14.000000000 14.080000000 92.4986 -13.880000000 14.200000000 69.2957 -15.560000000 15.840000000 69.2957 -17.320000000 17.400000000 92.4986 -17.200000000 17.480000000 69.2957 -18.960000000 19.160000000 69.2957 -20.600000000 20.880000000 69.2957 -22.320000000 22.400000000 92.4986 -22.320000000 22.480000000 69.2957 -24.000000000 24.120000000 92.4986 -23.880000000 24.160000000 69.2957 -25.640000000 25.720000000 92.4986 -25.600000000 25.880000000 69.2957 -27.320000000 27.440000000 92.4986 -27.320000000 27.600000000 69.2957 -29.000000000 29.080000000 92.4986 -28.880000000 29.240000000 69.2957 -30.600000000 30.840000000 69.2957 -32.320000000 32.440000000 92.4986 -32.240000000 32.520000000 69.2957 -34.000000000 34.080000000 92.4986 -33.920000000 34.200000000 69.2957 -35.640000000 35.720000000 92.4986 -35.560000000 35.800000000 69.2957 -37.320000000 37.400000000 92.4986 -37.200000000 37.480000000 69.2957 -39.000000000 39.080000000 92.4986 -38.920000000 39.200000000 69.2957 -40.640000000 40.840000000 69.2957
--- a/testdata/TRIOS-silvet/take_five/mix.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/mix.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,410 +1,241 @@ -7.400000000 7.480000000 391.995 -7.280000000 7.560000000 77.7817 -7.520000000 7.680000000 184.997 -7.560000000 7.680000000 369.994 -7.400000000 7.720000000 311.127 -7.360000000 7.760000000 233.082 -7.880000000 8.040000000 391.995 -7.880000000 8.080000000 77.7817 -8.080000000 8.160000000 184.997 -7.880000000 8.240000000 233.082 -8.000000000 8.240000000 311.127 -8.400000000 8.560000000 349.228 -8.320000000 8.680000000 116.541 -8.360000000 8.680000000 233.082 -8.640000000 8.800000000 174.614 +7.360000000 7.480000000 311.127 +7.380000000 7.520000000 391.995 +7.340000000 7.600000000 77.7817 +7.540000000 7.700000000 184.997 +7.320000000 7.720000000 233.082 +7.520000000 7.740000000 311.127 +7.880000000 8.020000000 391.995 +7.820000000 8.080000000 77.7817 +8.040000000 8.180000000 184.997 +7.860000000 8.200000000 233.082 +8.040000000 8.200000000 311.127 +8.380000000 8.500000000 233.082 +8.340000000 8.680000000 116.541 8.680000000 8.800000000 349.228 -8.680000000 8.920000000 277.183 -8.680000000 8.960000000 207.652 -9.000000000 9.200000000 77.7817 -9.080000000 9.240000000 391.995 -9.200000000 9.400000000 184.997 -9.080000000 9.440000000 233.082 -9.160000000 9.440000000 311.127 +8.680000000 8.840000000 174.614 +8.680000000 8.900000000 277.183 +8.680000000 8.940000000 207.652 +9.040000000 9.200000000 391.995 +9.080000000 9.260000000 77.7817 +9.040000000 9.360000000 233.082 +9.220000000 9.380000000 184.997 +9.220000000 9.380000000 311.127 9.520000000 9.720000000 77.7817 -9.720000000 9.800000000 369.994 -9.680000000 9.880000000 184.997 -9.560000000 9.880000000 233.082 +9.560000000 9.820000000 233.082 +9.700000000 9.840000000 184.997 9.720000000 9.920000000 311.127 -10.080000000 10.280000000 349.228 -10.000000000 10.360000000 116.541 +10.060000000 10.360000000 116.541 10.040000000 10.360000000 233.082 -10.320000000 10.520000000 174.614 -10.440000000 10.520000000 554.365 -10.400000000 10.560000000 349.228 +10.360000000 10.500000000 174.614 +10.380000000 10.580000000 207.652 10.360000000 10.600000000 277.183 -10.400000000 10.640000000 207.652 -10.680000000 10.760000000 77.7817 -10.640000000 10.760000000 87.3071 -10.720000000 10.880000000 391.995 -10.920000000 11.080000000 184.997 -10.720000000 11.120000000 233.082 -10.800000000 11.120000000 311.127 -11.280000000 11.360000000 391.995 -11.200000000 11.440000000 77.7817 -11.440000000 11.520000000 369.994 +10.760000000 10.880000000 77.7817 +10.700000000 11.000000000 233.082 +10.940000000 11.060000000 184.997 +10.920000000 11.080000000 311.127 +11.220000000 11.400000000 77.7817 +11.240000000 11.500000000 233.082 11.400000000 11.560000000 184.997 -11.200000000 11.600000000 233.082 -11.360000000 11.640000000 311.127 -11.760000000 11.880000000 349.228 -11.720000000 12.000000000 233.082 -11.680000000 12.040000000 116.541 -12.000000000 12.160000000 349.228 -12.040000000 12.200000000 174.614 +11.380000000 11.600000000 311.127 +11.740000000 12.000000000 116.541 +11.900000000 12.020000000 233.082 +12.060000000 12.180000000 174.614 +12.040000000 12.260000000 277.183 12.040000000 12.280000000 207.652 -12.040000000 12.280000000 277.183 -12.280000000 12.360000000 220 -12.360000000 12.480000000 77.7817 -12.360000000 12.560000000 391.995 -12.600000000 12.720000000 369.994 -12.360000000 12.800000000 233.082 -12.480000000 12.800000000 311.127 -12.880000000 13.040000000 77.7817 -13.040000000 13.240000000 184.997 -13.040000000 13.280000000 311.127 -13.400000000 13.520000000 349.228 -12.880000000 13.640000000 233.082 -13.320000000 13.680000000 116.541 -13.560000000 13.720000000 311.127 -13.640000000 13.840000000 174.614 -13.680000000 13.920000000 277.183 -13.680000000 13.960000000 207.652 -13.680000000 13.960000000 369.994 -13.880000000 13.960000000 391.995 -13.880000000 14.120000000 415.305 -14.080000000 14.160000000 77.7817 -14.040000000 14.160000000 391.995 -14.000000000 14.280000000 440 -14.240000000 14.400000000 184.997 -14.160000000 14.400000000 311.127 -14.240000000 14.400000000 466.164 -14.040000000 14.440000000 233.082 +12.400000000 12.520000000 391.995 +12.360000000 12.640000000 233.082 +12.560000000 12.720000000 184.997 +12.560000000 12.720000000 311.127 +12.880000000 13.060000000 77.7817 +12.940000000 13.180000000 233.082 +13.060000000 13.200000000 184.997 +13.060000000 13.240000000 311.127 +13.340000000 13.600000000 233.082 +13.400000000 13.660000000 116.541 +13.580000000 13.700000000 311.127 +13.680000000 13.800000000 174.614 +13.700000000 13.880000000 277.183 +13.680000000 13.900000000 207.652 +13.740000000 13.920000000 369.994 +13.720000000 13.940000000 391.995 +13.880000000 14.080000000 415.305 +14.020000000 14.280000000 440 +14.220000000 14.360000000 184.997 +14.100000000 14.380000000 233.082 +14.260000000 14.380000000 311.127 +14.260000000 14.400000000 466.164 14.360000000 14.600000000 440 -14.520000000 14.760000000 77.7817 -14.520000000 14.800000000 415.305 -14.720000000 14.920000000 311.127 -14.680000000 14.960000000 369.994 -15.000000000 15.320000000 116.541 -14.560000000 15.440000000 233.082 -15.320000000 15.480000000 174.614 -15.360000000 15.520000000 349.228 -15.400000000 15.600000000 207.652 -15.320000000 15.680000000 277.183 -15.720000000 15.800000000 391.995 -15.760000000 15.880000000 77.7817 +14.560000000 14.700000000 77.7817 +14.560000000 14.760000000 415.305 +14.720000000 14.840000000 184.997 +14.720000000 14.840000000 233.082 +14.740000000 14.880000000 369.994 +14.820000000 14.940000000 391.995 +15.060000000 15.200000000 116.541 +15.000000000 15.400000000 233.082 +15.360000000 15.660000000 277.183 +15.780000000 15.960000000 233.082 15.920000000 16.040000000 184.997 -15.720000000 16.120000000 233.082 -16.240000000 16.440000000 77.7817 -16.360000000 16.520000000 184.997 -16.440000000 16.520000000 369.994 -16.240000000 16.600000000 233.082 -15.680000000 16.600000000 311.127 -16.640000000 16.840000000 349.228 -16.680000000 16.960000000 116.541 -16.720000000 16.960000000 369.994 -16.880000000 17.000000000 311.127 -16.960000000 17.120000000 174.614 -17.080000000 17.160000000 349.228 -17.000000000 17.280000000 207.652 -16.960000000 17.400000000 277.183 -17.440000000 17.560000000 77.7817 -17.560000000 17.680000000 184.997 -17.400000000 17.760000000 233.082 -17.920000000 18.160000000 77.7817 -18.080000000 18.200000000 184.997 -17.880000000 18.280000000 233.082 -17.320000000 18.280000000 311.127 -18.400000000 18.480000000 349.228 -18.440000000 18.560000000 293.665 -18.360000000 18.600000000 116.541 -18.360000000 18.760000000 233.082 -18.680000000 18.840000000 174.614 -18.760000000 18.880000000 349.228 -18.720000000 18.880000000 415.305 -18.360000000 18.960000000 277.183 -18.960000000 19.040000000 622.254 -18.640000000 19.120000000 207.652 -19.080000000 19.200000000 391.995 -19.120000000 19.280000000 77.7817 -19.280000000 19.360000000 184.997 -19.240000000 19.440000000 311.127 -19.560000000 19.680000000 77.7817 -19.640000000 19.720000000 391.995 -19.720000000 19.880000000 184.997 -19.760000000 19.880000000 369.994 -19.720000000 19.960000000 311.127 -20.120000000 20.200000000 349.228 -19.000000000 20.360000000 233.082 -20.040000000 20.400000000 116.541 -20.280000000 20.440000000 311.127 -20.320000000 20.520000000 174.614 -20.440000000 20.560000000 739.989 -20.360000000 20.600000000 277.183 -20.520000000 20.600000000 391.995 -20.360000000 20.640000000 369.994 -20.440000000 20.680000000 207.652 -20.600000000 20.760000000 415.305 -20.640000000 20.920000000 77.7817 -20.680000000 20.920000000 440 -20.920000000 21.000000000 369.994 -20.920000000 21.080000000 184.997 -20.720000000 21.080000000 233.082 -20.960000000 21.080000000 466.164 -20.880000000 21.120000000 311.127 +15.700000000 16.360000000 311.127 +16.360000000 16.500000000 233.082 +16.400000000 16.540000000 311.127 +16.680000000 16.800000000 349.228 +16.740000000 16.900000000 369.994 +17.080000000 17.200000000 207.652 +16.980000000 17.320000000 277.183 +17.340000000 18.000000000 311.127 +18.060000000 18.220000000 311.127 +18.380000000 18.640000000 277.183 +18.620000000 18.740000000 233.082 +18.720000000 18.900000000 277.183 +18.680000000 19.040000000 207.652 +19.260000000 19.380000000 311.127 +19.760000000 19.880000000 311.127 +19.000000000 19.980000000 233.082 +20.080000000 20.300000000 233.082 +20.080000000 20.360000000 116.541 +20.420000000 20.560000000 277.183 +20.440000000 20.580000000 207.652 +20.400000000 20.600000000 369.994 +20.500000000 20.620000000 391.995 +20.560000000 20.740000000 415.305 +20.720000000 20.840000000 77.7817 +20.700000000 20.920000000 440 +20.840000000 21.060000000 233.082 +20.960000000 21.080000000 311.127 +20.940000000 21.080000000 466.164 21.040000000 21.240000000 440 -21.200000000 21.400000000 77.7817 -21.320000000 21.440000000 391.995 -21.200000000 21.440000000 415.305 -21.440000000 21.560000000 739.989 -21.200000000 21.600000000 233.082 -21.400000000 21.640000000 311.127 -21.360000000 21.640000000 369.994 -21.680000000 21.760000000 220 -21.680000000 22.040000000 116.541 -21.760000000 22.120000000 233.082 -22.040000000 22.200000000 174.614 -21.800000000 22.200000000 349.228 -22.080000000 22.320000000 207.652 -22.040000000 22.360000000 277.183 -22.360000000 22.520000000 77.7817 -22.400000000 22.520000000 391.995 -22.600000000 22.720000000 369.994 -22.560000000 22.760000000 184.997 -22.360000000 22.800000000 233.082 -22.840000000 23.160000000 77.7817 -23.040000000 23.240000000 184.997 -22.880000000 23.280000000 233.082 -22.400000000 23.280000000 311.127 -23.440000000 23.520000000 311.127 -23.400000000 23.560000000 293.665 -23.320000000 23.600000000 116.541 -23.360000000 23.760000000 233.082 -23.680000000 23.840000000 349.228 -23.680000000 23.880000000 174.614 -23.760000000 23.880000000 415.305 -23.360000000 23.920000000 277.183 -23.640000000 24.040000000 207.652 -24.080000000 24.200000000 391.995 -24.080000000 24.200000000 698.456 -24.160000000 24.280000000 77.7817 -24.240000000 24.400000000 184.997 -24.240000000 24.400000000 311.127 -24.600000000 24.680000000 391.995 -24.600000000 24.760000000 77.7817 -24.760000000 24.840000000 369.994 -24.720000000 24.880000000 184.997 -23.920000000 24.920000000 233.082 -24.720000000 24.960000000 311.127 -25.040000000 25.160000000 739.989 -25.080000000 25.240000000 233.082 -25.000000000 25.240000000 369.994 -24.960000000 25.280000000 349.228 -24.920000000 25.360000000 116.541 -25.200000000 25.360000000 311.127 -25.280000000 25.360000000 523.251 -25.280000000 25.480000000 174.614 -25.360000000 25.560000000 349.228 -25.400000000 25.640000000 207.652 -25.280000000 25.720000000 277.183 -25.760000000 25.840000000 391.995 -25.920000000 26.040000000 369.994 -25.880000000 26.120000000 184.997 -26.200000000 26.400000000 77.7817 -26.360000000 26.560000000 184.997 -25.760000000 26.600000000 233.082 -25.640000000 26.640000000 311.127 -26.720000000 26.920000000 349.228 -26.720000000 27.000000000 233.082 -26.640000000 27.040000000 116.541 -27.000000000 27.200000000 349.228 -26.960000000 27.240000000 174.614 -27.000000000 27.280000000 207.652 -27.000000000 27.320000000 277.183 -27.400000000 27.520000000 622.254 -27.320000000 27.640000000 246.942 -27.360000000 27.640000000 369.994 -27.520000000 27.800000000 233.082 -27.520000000 27.800000000 311.127 -27.640000000 27.800000000 739.989 -27.880000000 28.080000000 622.254 -28.040000000 28.120000000 523.251 -27.800000000 28.200000000 155.563 -28.120000000 28.240000000 1479.98 -27.840000000 28.280000000 311.127 -28.000000000 28.320000000 233.082 -28.080000000 28.360000000 493.883 -28.360000000 28.440000000 349.228 -28.360000000 28.640000000 415.305 -28.520000000 28.680000000 349.228 -28.560000000 28.760000000 466.164 -28.320000000 28.840000000 174.614 -28.760000000 28.880000000 1479.98 -28.720000000 28.920000000 493.883 -28.640000000 28.960000000 207.652 -28.640000000 28.960000000 311.127 -28.880000000 29.080000000 523.251 -29.040000000 29.200000000 116.541 -29.040000000 29.240000000 349.228 -29.000000000 29.240000000 554.365 -29.120000000 29.240000000 1661.22 -29.040000000 29.280000000 233.082 -29.240000000 29.320000000 1396.91 -29.280000000 29.400000000 739.989 -29.240000000 29.440000000 207.652 -29.240000000 29.440000000 698.456 -29.520000000 29.720000000 138.591 -29.520000000 29.720000000 554.365 -29.200000000 29.920000000 277.183 -29.640000000 29.960000000 207.652 -29.680000000 30.000000000 466.164 -30.000000000 30.240000000 369.994 -30.160000000 30.280000000 391.995 -30.000000000 30.360000000 155.563 -30.160000000 30.400000000 415.305 +21.220000000 21.400000000 415.305 +21.440000000 21.560000000 184.997 +21.380000000 21.580000000 369.994 +21.780000000 22.080000000 233.082 +22.080000000 22.320000000 277.183 +22.440000000 23.180000000 311.127 +23.480000000 23.620000000 277.183 +23.540000000 23.720000000 233.082 +23.720000000 23.880000000 277.183 +23.640000000 23.980000000 207.652 +24.280000000 24.400000000 311.127 +23.960000000 24.840000000 233.082 +24.740000000 24.860000000 184.997 +24.760000000 24.880000000 311.127 +24.980000000 25.100000000 349.228 +25.060000000 25.180000000 116.541 +25.020000000 25.200000000 369.994 +25.220000000 25.340000000 311.127 +25.300000000 25.660000000 277.183 +25.820000000 26.000000000 233.082 +25.920000000 26.040000000 184.997 +25.640000000 26.220000000 311.127 +26.400000000 26.540000000 233.082 +26.280000000 26.540000000 311.127 +26.700000000 26.980000000 116.541 +27.020000000 27.180000000 174.614 +27.060000000 27.220000000 207.652 +27.040000000 27.260000000 277.183 +27.400000000 27.520000000 369.994 +27.400000000 27.540000000 622.254 +27.580000000 27.700000000 233.082 +27.540000000 27.740000000 311.127 +27.600000000 27.740000000 739.989 +28.040000000 28.200000000 233.082 +27.920000000 28.240000000 311.127 +28.080000000 28.340000000 493.883 +28.380000000 28.600000000 415.305 +28.360000000 28.680000000 174.614 +28.580000000 28.700000000 466.164 +28.760000000 28.880000000 207.652 +28.700000000 28.880000000 493.883 +28.680000000 28.900000000 311.127 +28.860000000 29.040000000 523.251 +29.080000000 29.220000000 233.082 +29.020000000 29.220000000 554.365 +29.220000000 29.360000000 277.183 +29.240000000 29.400000000 207.652 +29.240000000 29.400000000 698.456 +29.540000000 29.680000000 554.365 +29.520000000 29.860000000 277.183 +29.720000000 29.880000000 207.652 +29.680000000 29.940000000 466.164 +30.040000000 30.220000000 369.994 +30.200000000 30.360000000 415.305 30.320000000 30.520000000 440 -30.320000000 30.560000000 184.997 -30.360000000 30.560000000 369.994 -30.360000000 30.640000000 277.183 -30.520000000 30.720000000 466.164 -30.400000000 30.760000000 155.563 -30.640000000 30.880000000 493.883 -30.720000000 30.880000000 1479.98 -30.840000000 30.920000000 523.251 -30.680000000 30.960000000 207.652 -30.880000000 31.080000000 184.997 -30.920000000 31.080000000 622.254 -31.240000000 31.320000000 369.994 -31.240000000 31.360000000 493.883 -31.200000000 31.400000000 123.471 -31.360000000 31.600000000 184.997 -30.840000000 31.600000000 246.942 -31.320000000 31.680000000 415.305 -31.640000000 31.920000000 349.228 -31.680000000 32.000000000 277.183 -31.760000000 32.040000000 138.591 -31.840000000 32.040000000 369.994 -31.960000000 32.040000000 391.995 -32.040000000 32.160000000 349.228 -31.960000000 32.240000000 415.305 -32.040000000 32.280000000 174.614 -32.000000000 32.280000000 246.942 +30.360000000 30.540000000 184.997 +30.340000000 30.620000000 277.183 +30.520000000 30.700000000 466.164 +30.680000000 30.880000000 493.883 +30.920000000 31.040000000 184.997 +30.880000000 31.040000000 246.942 +30.920000000 31.040000000 622.254 +31.300000000 31.520000000 246.942 +31.380000000 31.540000000 184.997 +31.340000000 31.620000000 415.305 +31.640000000 31.900000000 349.228 +31.840000000 32.000000000 369.994 +32.080000000 32.220000000 174.614 +31.980000000 32.220000000 415.305 32.200000000 32.320000000 440 -32.240000000 32.360000000 880 -32.240000000 32.400000000 138.591 -32.440000000 32.560000000 92.4986 -32.320000000 32.560000000 466.164 -32.360000000 32.640000000 184.997 -32.560000000 32.680000000 880 -32.600000000 32.720000000 369.994 -32.520000000 32.720000000 440 -32.480000000 32.840000000 233.082 -32.760000000 32.840000000 932.328 -32.760000000 32.880000000 466.164 -32.840000000 33.000000000 493.883 -32.840000000 33.080000000 92.4986 -33.000000000 33.120000000 277.183 -33.040000000 33.120000000 1661.22 -33.080000000 33.160000000 369.994 -32.880000000 33.200000000 184.997 -33.120000000 33.240000000 554.365 -33.000000000 33.280000000 233.082 -33.400000000 33.560000000 349.228 -33.360000000 33.640000000 233.082 -33.280000000 33.720000000 116.541 -33.520000000 33.720000000 523.251 -33.680000000 33.880000000 293.665 -33.320000000 33.920000000 554.365 -33.640000000 33.960000000 207.652 -33.920000000 34.040000000 1174.66 -33.880000000 34.080000000 587.33 -34.040000000 34.120000000 184.997 -34.080000000 34.240000000 622.254 -34.040000000 34.280000000 369.994 -34.000000000 34.360000000 246.942 -34.240000000 34.400000000 739.989 -34.200000000 34.440000000 233.082 -34.160000000 34.440000000 311.127 -34.520000000 34.760000000 155.563 -34.760000000 34.840000000 1479.98 -34.520000000 34.920000000 311.127 -34.600000000 34.960000000 233.082 -34.680000000 35.000000000 493.883 -35.080000000 35.160000000 830.609 -35.000000000 35.200000000 349.228 -35.000000000 35.280000000 415.305 -35.240000000 35.400000000 466.164 -34.960000000 35.440000000 174.614 -35.360000000 35.560000000 493.883 -35.400000000 35.560000000 1479.98 -35.280000000 35.640000000 207.652 -35.280000000 35.640000000 311.127 -35.520000000 35.720000000 523.251 -35.720000000 35.800000000 1661.22 -35.640000000 35.880000000 116.541 -35.680000000 35.920000000 233.082 -35.720000000 35.920000000 349.228 -35.680000000 35.960000000 554.365 -35.920000000 36.000000000 116.541 -35.920000000 36.080000000 698.456 -35.880000000 36.120000000 207.652 -36.200000000 36.360000000 138.591 -36.200000000 36.440000000 554.365 -35.840000000 36.520000000 277.183 -36.320000000 36.600000000 207.652 -36.360000000 36.680000000 466.164 -36.760000000 36.920000000 311.127 -36.680000000 36.960000000 369.994 -36.640000000 37.040000000 155.563 -36.880000000 37.080000000 415.305 -37.040000000 37.160000000 369.994 -37.040000000 37.240000000 184.997 -37.000000000 37.240000000 277.183 -37.000000000 37.240000000 440 -37.080000000 37.280000000 155.563 -37.200000000 37.400000000 466.164 -37.360000000 37.440000000 155.563 -37.360000000 37.560000000 493.883 -37.400000000 37.560000000 1479.98 -37.440000000 37.600000000 311.127 -37.320000000 37.680000000 207.652 -37.560000000 37.720000000 184.997 -37.600000000 37.720000000 369.994 -37.600000000 37.760000000 622.254 -37.880000000 38.000000000 493.883 -37.880000000 38.120000000 123.471 -38.080000000 38.200000000 184.997 -37.520000000 38.280000000 246.942 -38.000000000 38.360000000 415.305 -38.320000000 38.560000000 349.228 -38.560000000 38.680000000 415.305 -38.320000000 38.720000000 277.183 -38.360000000 38.760000000 138.591 -38.720000000 38.880000000 349.228 -38.600000000 38.920000000 174.614 -38.760000000 38.920000000 1661.22 -38.680000000 38.960000000 246.942 -38.720000000 38.960000000 554.365 -38.920000000 39.040000000 1479.98 -38.880000000 39.080000000 138.591 -38.920000000 39.080000000 493.883 -39.040000000 39.160000000 277.183 -39.120000000 39.240000000 92.4986 -39.240000000 39.320000000 369.994 -39.040000000 39.360000000 184.997 -39.120000000 39.520000000 233.082 -39.520000000 39.720000000 92.4986 -39.000000000 39.720000000 466.164 -39.720000000 39.800000000 369.994 -39.560000000 39.880000000 184.997 -39.800000000 40.000000000 466.164 -40.040000000 40.280000000 349.228 -39.640000000 40.320000000 233.082 -40.040000000 40.400000000 116.541 -40.360000000 40.560000000 293.665 -40.280000000 40.640000000 207.652 -40.720000000 40.960000000 391.995 -40.640000000 41.000000000 77.7817 -40.680000000 41.080000000 233.082 -47.800000000 47.920000000 523.251 -48.040000000 48.200000000 523.251 -48.160000000 48.240000000 1046.5 +32.320000000 32.520000000 466.164 +32.580000000 32.700000000 184.997 +32.520000000 32.760000000 233.082 +32.720000000 32.860000000 466.164 +32.860000000 33.000000000 493.883 +33.040000000 33.160000000 233.082 +33.400000000 33.520000000 233.082 +33.340000000 33.580000000 554.365 +33.540000000 33.700000000 523.251 +33.700000000 33.880000000 207.652 +33.680000000 33.880000000 554.365 +33.880000000 34.040000000 587.33 +34.100000000 34.220000000 622.254 +34.200000000 34.360000000 311.127 +34.260000000 34.400000000 739.989 +34.700000000 34.840000000 233.082 +34.680000000 34.840000000 311.127 +34.700000000 34.940000000 493.883 +35.020000000 35.260000000 415.305 +35.000000000 35.300000000 174.614 +35.240000000 35.360000000 466.164 +35.380000000 35.500000000 207.652 +35.320000000 35.520000000 311.127 +35.360000000 35.540000000 493.883 +35.540000000 35.700000000 523.251 +35.720000000 35.900000000 116.541 +35.680000000 35.900000000 554.365 +35.900000000 36.020000000 207.652 +35.900000000 36.020000000 277.183 +35.920000000 36.060000000 698.456 +36.260000000 36.400000000 554.365 +36.200000000 36.480000000 277.183 +36.400000000 36.520000000 207.652 +36.400000000 36.640000000 466.164 +36.740000000 36.900000000 155.563 +36.680000000 36.900000000 369.994 +36.880000000 37.040000000 415.305 +37.040000000 37.160000000 184.997 +37.020000000 37.180000000 440 +37.020000000 37.200000000 277.183 +37.200000000 37.380000000 466.164 +37.400000000 37.520000000 207.652 +37.380000000 37.560000000 493.883 +37.580000000 37.700000000 184.997 +37.560000000 37.740000000 246.942 +37.620000000 37.740000000 622.254 +37.880000000 38.100000000 246.942 +38.080000000 38.220000000 184.997 +38.040000000 38.320000000 415.305 +38.360000000 38.480000000 277.183 +38.360000000 38.580000000 349.228 +38.720000000 38.840000000 174.614 +38.700000000 38.920000000 554.365 +38.720000000 38.960000000 246.942 +38.920000000 39.060000000 493.883 +39.020000000 39.240000000 466.164 +39.220000000 39.440000000 233.082 +39.540000000 39.660000000 92.4986 +39.440000000 39.680000000 466.164 +39.700000000 39.820000000 184.997 +39.680000000 40.140000000 233.082 +40.080000000 40.260000000 116.541 +40.360000000 40.540000000 207.652 +40.760000000 40.960000000 233.082
--- a/testdata/TRIOS-silvet/take_five/piano.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/piano.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,339 +1,245 @@ -7.360000000 7.520000000 391.995 -7.560000000 7.680000000 369.994 -7.480000000 7.720000000 311.127 -7.520000000 7.760000000 184.997 -7.880000000 8.080000000 391.995 -8.040000000 8.200000000 184.997 -8.080000000 8.200000000 369.994 -7.320000000 8.240000000 233.082 -7.960000000 8.240000000 311.127 -7.280000000 8.320000000 77.7817 -8.360000000 8.440000000 220 -8.360000000 8.680000000 233.082 -8.360000000 8.840000000 349.228 -8.640000000 8.880000000 174.614 -8.680000000 8.960000000 277.183 -8.640000000 9.000000000 207.652 -8.280000000 9.040000000 116.541 -9.040000000 9.280000000 391.995 -9.200000000 9.440000000 184.997 -9.200000000 9.480000000 311.127 -9.600000000 9.720000000 391.995 -8.960000000 9.800000000 77.7817 -9.680000000 9.880000000 184.997 -9.720000000 9.880000000 369.994 -9.000000000 9.960000000 233.082 -9.720000000 9.960000000 311.127 -10.040000000 10.120000000 220 -10.040000000 10.320000000 349.228 -10.040000000 10.400000000 233.082 -9.960000000 10.440000000 116.541 -10.440000000 10.520000000 554.365 -10.400000000 10.560000000 349.228 -10.320000000 10.600000000 174.614 -10.320000000 10.640000000 277.183 -10.320000000 10.680000000 207.652 -10.520000000 10.720000000 116.541 -10.680000000 10.760000000 220 -10.720000000 10.920000000 391.995 -10.960000000 11.040000000 369.994 -10.880000000 11.120000000 184.997 -10.840000000 11.120000000 311.127 -11.280000000 11.360000000 391.995 -11.400000000 11.520000000 369.994 -11.360000000 11.560000000 184.997 -10.640000000 11.640000000 77.7817 -10.720000000 11.640000000 233.082 -11.360000000 11.640000000 311.127 -11.720000000 12.000000000 233.082 -11.720000000 12.200000000 349.228 -12.000000000 12.240000000 174.614 -12.000000000 12.280000000 207.652 -12.000000000 12.320000000 277.183 -11.640000000 12.360000000 116.541 -12.280000000 12.440000000 220 -12.360000000 12.560000000 391.995 -12.520000000 12.600000000 184.997 -12.560000000 12.680000000 195.998 -12.600000000 12.720000000 369.994 -12.680000000 12.760000000 184.997 -12.520000000 12.800000000 311.127 -12.920000000 13.080000000 391.995 -12.320000000 13.160000000 77.7817 -13.080000000 13.200000000 369.994 -13.040000000 13.240000000 184.997 -13.040000000 13.280000000 311.127 -12.360000000 13.680000000 233.082 -13.400000000 13.680000000 349.228 -13.320000000 13.720000000 116.541 -13.680000000 13.800000000 554.365 -13.720000000 13.840000000 349.228 -13.600000000 13.920000000 174.614 -13.680000000 13.960000000 207.652 -13.640000000 13.960000000 277.183 -13.800000000 14.040000000 116.541 -14.040000000 14.240000000 391.995 -14.240000000 14.320000000 369.994 -14.200000000 14.400000000 184.997 -14.160000000 14.440000000 311.127 -14.720000000 14.840000000 369.994 -14.720000000 14.880000000 184.997 -14.840000000 14.920000000 195.998 -13.960000000 14.960000000 77.7817 -14.000000000 14.960000000 233.082 -14.680000000 14.960000000 311.127 -15.040000000 15.360000000 233.082 -14.960000000 15.480000000 116.541 -15.040000000 15.520000000 349.228 -15.320000000 15.560000000 174.614 -15.360000000 15.640000000 277.183 -15.320000000 15.680000000 207.652 -15.720000000 15.800000000 391.995 -15.880000000 16.080000000 369.994 -15.880000000 16.120000000 184.997 -15.640000000 16.120000000 233.082 -15.880000000 16.160000000 311.127 -16.240000000 16.400000000 391.995 -16.400000000 16.520000000 369.994 -16.360000000 16.560000000 184.997 -16.520000000 16.600000000 195.998 -15.640000000 16.640000000 77.7817 -16.200000000 16.640000000 233.082 -16.400000000 16.640000000 311.127 -16.720000000 16.960000000 349.228 -16.760000000 17.040000000 233.082 -16.640000000 17.120000000 116.541 -17.040000000 17.200000000 349.228 -16.920000000 17.240000000 174.614 -17.240000000 17.320000000 116.541 -17.000000000 17.320000000 277.183 -16.960000000 17.360000000 207.652 -17.320000000 17.640000000 77.7817 -17.520000000 17.720000000 184.997 -17.600000000 17.720000000 369.994 -17.640000000 17.760000000 195.998 -17.520000000 17.840000000 311.127 -17.920000000 18.080000000 391.995 -18.040000000 18.240000000 184.997 -17.720000000 18.320000000 77.7817 -18.040000000 18.320000000 311.127 -18.360000000 18.600000000 349.228 -17.360000000 18.720000000 233.082 -18.720000000 18.840000000 349.228 -18.600000000 18.920000000 174.614 -18.680000000 19.000000000 277.183 -18.280000000 19.080000000 116.541 -18.640000000 19.080000000 207.652 -19.080000000 19.240000000 391.995 -19.240000000 19.440000000 184.997 -19.160000000 19.480000000 311.127 -19.000000000 19.760000000 77.7817 -19.560000000 19.800000000 391.995 -19.760000000 19.920000000 369.994 -19.720000000 19.960000000 184.997 -19.640000000 20.000000000 311.127 -20.120000000 20.240000000 349.228 -19.040000000 20.400000000 233.082 -20.400000000 20.480000000 349.228 -20.240000000 20.600000000 174.614 -19.960000000 20.640000000 116.541 -20.320000000 20.680000000 207.652 -20.320000000 20.680000000 277.183 -20.680000000 20.760000000 220 -20.720000000 20.920000000 391.995 -20.640000000 20.960000000 77.7817 -20.920000000 21.040000000 369.994 -20.840000000 21.120000000 184.997 -20.880000000 21.160000000 311.127 -21.280000000 21.360000000 391.995 -21.400000000 21.560000000 369.994 -21.360000000 21.600000000 184.997 -20.680000000 21.640000000 233.082 -21.040000000 21.680000000 77.7817 -21.360000000 21.680000000 311.127 -21.680000000 21.760000000 220 -21.760000000 22.000000000 233.082 -21.640000000 22.160000000 116.541 -21.720000000 22.240000000 349.228 -21.960000000 22.280000000 174.614 -22.000000000 22.320000000 277.183 -22.200000000 22.360000000 116.541 -21.960000000 22.360000000 207.652 -22.360000000 22.440000000 220 -22.360000000 22.600000000 391.995 -22.600000000 22.720000000 369.994 -22.520000000 22.760000000 184.997 -22.480000000 22.800000000 311.127 -22.920000000 23.120000000 391.995 -23.120000000 23.200000000 369.994 -23.000000000 23.240000000 184.997 -22.320000000 23.320000000 77.7817 -23.040000000 23.320000000 311.127 -23.360000000 23.440000000 220 -22.320000000 23.680000000 233.082 -23.360000000 23.880000000 349.228 -23.600000000 23.920000000 174.614 -23.320000000 23.960000000 116.541 -23.680000000 23.960000000 277.183 -23.640000000 24.040000000 207.652 -23.960000000 24.040000000 220 -24.040000000 24.240000000 391.995 -24.200000000 24.440000000 184.997 -24.360000000 24.440000000 369.994 -24.200000000 24.480000000 311.127 -24.560000000 24.720000000 391.995 -24.720000000 24.880000000 184.997 -24.760000000 24.920000000 369.994 -24.880000000 24.960000000 195.998 -24.000000000 24.960000000 233.082 -24.720000000 24.960000000 311.127 -24.000000000 25.000000000 77.7817 -25.040000000 25.120000000 220 -25.080000000 25.360000000 233.082 -24.960000000 25.400000000 116.541 -25.400000000 25.480000000 554.365 -25.040000000 25.560000000 349.228 -25.280000000 25.600000000 174.614 -25.320000000 25.680000000 277.183 -25.360000000 25.720000000 207.652 -25.760000000 25.880000000 391.995 -25.920000000 26.040000000 369.994 -25.880000000 26.120000000 184.997 -26.040000000 26.160000000 246.942 -25.920000000 26.160000000 311.127 -26.240000000 26.400000000 391.995 -25.680000000 26.440000000 77.7817 -26.400000000 26.520000000 369.994 -26.480000000 26.600000000 77.7817 -26.320000000 26.600000000 184.997 -26.320000000 26.640000000 311.127 -26.680000000 26.760000000 220 -25.720000000 27.000000000 233.082 -26.720000000 27.200000000 349.228 -26.600000000 27.280000000 116.541 -26.920000000 27.280000000 174.614 -26.960000000 27.320000000 207.652 -27.000000000 27.320000000 277.183 -27.320000000 27.640000000 123.471 -27.360000000 27.640000000 369.994 -27.320000000 27.680000000 246.942 -27.520000000 27.840000000 233.082 -27.760000000 28.200000000 155.563 -27.480000000 28.320000000 311.127 -27.960000000 28.360000000 233.082 -28.360000000 28.440000000 349.228 -28.520000000 28.720000000 349.228 -28.280000000 29.000000000 174.614 -28.640000000 29.000000000 311.127 -28.640000000 29.040000000 207.652 -29.000000000 29.120000000 220 -29.040000000 29.240000000 349.228 -29.040000000 29.280000000 233.082 -28.960000000 29.360000000 116.541 -29.160000000 29.480000000 207.652 -29.480000000 29.800000000 138.591 -29.600000000 29.960000000 207.652 -29.200000000 29.960000000 277.183 -30.040000000 30.360000000 311.127 -30.320000000 30.600000000 184.997 -30.360000000 30.600000000 369.994 -30.320000000 30.680000000 277.183 -29.960000000 30.760000000 155.563 -30.680000000 30.920000000 523.251 -30.640000000 31.000000000 207.652 -30.800000000 31.000000000 311.127 -30.920000000 31.040000000 369.994 -30.840000000 31.120000000 184.997 -31.200000000 31.360000000 369.994 -31.160000000 31.400000000 123.471 -31.280000000 31.640000000 184.997 -30.840000000 31.680000000 246.942 -31.640000000 32.160000000 277.183 -31.960000000 32.280000000 174.614 -32.000000000 32.320000000 246.942 -32.040000000 32.320000000 349.228 -31.640000000 32.440000000 138.591 -32.360000000 32.520000000 277.183 -32.320000000 32.640000000 184.997 -32.560000000 32.760000000 369.994 -32.480000000 32.840000000 233.082 -32.840000000 33.120000000 277.183 -33.080000000 33.160000000 369.994 -32.280000000 33.200000000 92.4986 -32.840000000 33.240000000 184.997 -33.160000000 33.240000000 246.942 -32.960000000 33.680000000 233.082 -33.360000000 33.680000000 349.228 -33.240000000 33.920000000 116.541 -33.640000000 33.960000000 293.665 -33.600000000 34.040000000 207.652 -34.080000000 34.160000000 739.989 -34.040000000 34.280000000 369.994 -33.960000000 34.360000000 123.471 -34.000000000 34.360000000 246.942 -34.200000000 34.480000000 233.082 -34.440000000 34.880000000 155.563 -34.600000000 34.960000000 233.082 -34.160000000 34.960000000 311.127 -35.040000000 35.320000000 349.228 -34.920000000 35.600000000 174.614 -35.240000000 35.680000000 207.652 -35.280000000 35.680000000 311.127 -35.640000000 35.800000000 220 -35.680000000 35.960000000 233.082 -35.680000000 35.960000000 349.228 -35.600000000 36.040000000 116.541 -35.800000000 36.120000000 207.652 -36.120000000 36.400000000 138.591 -35.840000000 36.600000000 277.183 -36.280000000 36.640000000 207.652 -36.680000000 37.000000000 311.127 -37.000000000 37.240000000 369.994 -36.960000000 37.280000000 184.997 -37.000000000 37.280000000 277.183 -36.600000000 37.440000000 155.563 -37.360000000 37.560000000 523.251 -37.320000000 37.600000000 207.652 -37.400000000 37.640000000 103.826 -37.400000000 37.680000000 311.127 -37.600000000 37.720000000 369.994 -37.560000000 37.760000000 184.997 -37.800000000 38.160000000 123.471 -37.880000000 38.240000000 369.994 -38.000000000 38.320000000 184.997 -37.520000000 38.320000000 246.942 -38.320000000 38.840000000 277.183 -38.680000000 38.920000000 349.228 -38.640000000 38.960000000 174.614 -38.640000000 38.960000000 246.942 -38.280000000 39.120000000 138.591 -39.040000000 39.160000000 277.183 -38.920000000 39.240000000 92.4986 -39.240000000 39.360000000 369.994 -39.000000000 39.400000000 184.997 -39.120000000 39.520000000 233.082 -39.440000000 39.800000000 92.4986 -39.520000000 39.800000000 277.183 -39.680000000 39.840000000 369.994 -39.520000000 39.880000000 184.997 -39.840000000 39.920000000 246.942 -40.000000000 40.080000000 220 -39.600000000 40.320000000 233.082 -40.040000000 40.360000000 349.228 -40.320000000 40.640000000 293.665 -40.240000000 40.680000000 207.652 -39.920000000 40.720000000 116.541 -40.760000000 40.840000000 155.563 -40.680000000 41.080000000 233.082 -40.720000000 41.080000000 391.995 -40.640000000 41.200000000 77.7817 -46.440000000 46.520000000 698.456 -46.440000000 46.520000000 880 -46.440000000 46.600000000 587.33 -46.520000000 46.600000000 1174.66 -46.640000000 46.720000000 554.365 -46.760000000 46.880000000 622.254 -46.800000000 46.880000000 1661.22 -46.760000000 46.920000000 523.251 -46.760000000 46.920000000 1244.51 -46.760000000 46.920000000 1396.91 +7.240000000 7.440000000 220 +7.320000000 7.600000000 391.995 +7.240000000 7.640000000 77.7817 +7.320000000 7.700000000 233.082 +7.520000000 7.740000000 184.997 +7.420000000 7.740000000 311.127 +7.620000000 7.760000000 195.998 +7.640000000 7.760000000 246.942 +7.840000000 7.980000000 220 +7.860000000 8.140000000 391.995 +7.880000000 8.180000000 233.082 +7.960000000 8.200000000 311.127 +8.000000000 8.220000000 184.997 +7.700000000 8.260000000 77.7817 +8.360000000 8.700000000 233.082 +8.340000000 8.720000000 116.541 +8.660000000 8.860000000 174.614 +8.660000000 8.940000000 277.183 +8.660000000 8.960000000 207.652 +9.040000000 9.200000000 391.995 +9.000000000 9.280000000 77.7817 +9.080000000 9.340000000 233.082 +9.200000000 9.400000000 184.997 +9.220000000 9.400000000 311.127 +9.320000000 9.440000000 246.942 +9.520000000 9.740000000 77.7817 +9.560000000 9.840000000 233.082 +9.700000000 9.860000000 184.997 +9.720000000 9.880000000 311.127 +10.140000000 10.260000000 233.082 +10.020000000 10.340000000 116.541 +10.280000000 10.400000000 233.082 +10.340000000 10.520000000 174.614 +10.360000000 10.600000000 277.183 +10.380000000 10.640000000 207.652 +10.680000000 10.940000000 77.7817 +10.760000000 11.000000000 233.082 +10.920000000 11.040000000 184.997 +10.920000000 11.060000000 311.127 +11.220000000 11.420000000 77.7817 +11.280000000 11.500000000 233.082 +11.400000000 11.540000000 184.997 +11.400000000 11.600000000 311.127 +11.820000000 11.940000000 233.082 +11.720000000 12.040000000 116.541 +12.040000000 12.180000000 174.614 +12.040000000 12.260000000 277.183 +12.040000000 12.300000000 207.652 +12.360000000 12.580000000 77.7817 +12.420000000 12.640000000 233.082 +12.560000000 12.720000000 184.997 +12.580000000 12.720000000 311.127 +12.900000000 13.060000000 77.7817 +13.060000000 13.180000000 184.997 +12.940000000 13.180000000 233.082 +13.060000000 13.240000000 311.127 +13.440000000 13.560000000 233.082 +13.380000000 13.700000000 116.541 +13.660000000 13.840000000 174.614 +13.680000000 13.900000000 207.652 +13.680000000 13.900000000 277.183 +14.000000000 14.240000000 77.7817 +14.080000000 14.340000000 233.082 +14.220000000 14.360000000 184.997 +14.220000000 14.380000000 311.127 +14.520000000 14.720000000 77.7817 +14.600000000 14.840000000 233.082 +14.740000000 14.860000000 184.997 +14.720000000 14.860000000 311.127 +15.020000000 15.300000000 116.541 +15.080000000 15.340000000 233.082 +15.360000000 15.520000000 174.614 +15.360000000 15.580000000 277.183 +15.360000000 15.600000000 207.652 +15.700000000 15.900000000 77.7817 +15.900000000 16.040000000 184.997 +15.740000000 16.040000000 233.082 +15.900000000 16.060000000 311.127 +16.220000000 16.400000000 77.7817 +16.380000000 16.520000000 184.997 +16.300000000 16.540000000 233.082 +16.400000000 16.540000000 311.127 +16.760000000 16.940000000 233.082 +16.700000000 17.000000000 116.541 +17.020000000 17.180000000 174.614 +17.020000000 17.260000000 277.183 +17.020000000 17.280000000 207.652 +17.380000000 17.560000000 77.7817 +17.440000000 17.680000000 233.082 +17.560000000 17.700000000 184.997 +17.560000000 17.760000000 311.127 +17.880000000 18.080000000 77.7817 +17.940000000 18.180000000 233.082 +18.060000000 18.180000000 311.127 +18.060000000 18.200000000 184.997 +18.360000000 18.640000000 116.541 +18.680000000 18.860000000 174.614 +18.700000000 18.960000000 277.183 +18.700000000 18.980000000 207.652 +19.040000000 19.280000000 77.7817 +19.080000000 19.360000000 233.082 +19.260000000 19.400000000 184.997 +19.240000000 19.400000000 311.127 +19.560000000 19.740000000 77.7817 +19.580000000 19.840000000 233.082 +19.760000000 19.900000000 311.127 +19.740000000 19.920000000 184.997 +20.040000000 20.420000000 116.541 +20.340000000 20.520000000 174.614 +20.360000000 20.600000000 277.183 +20.380000000 20.660000000 207.652 +20.700000000 20.900000000 77.7817 +20.780000000 21.020000000 233.082 +20.920000000 21.040000000 311.127 +20.900000000 21.060000000 184.997 +21.220000000 21.440000000 77.7817 +21.280000000 21.520000000 233.082 +21.400000000 21.540000000 184.997 +21.400000000 21.580000000 311.127 +21.720000000 21.980000000 116.541 +21.900000000 22.020000000 233.082 +22.040000000 22.200000000 174.614 +22.020000000 22.260000000 277.183 +22.040000000 22.300000000 207.652 +22.360000000 22.580000000 77.7817 +22.420000000 22.660000000 233.082 +22.560000000 22.720000000 184.997 +22.580000000 22.720000000 311.127 +22.860000000 23.080000000 77.7817 +22.960000000 23.160000000 233.082 +23.060000000 23.200000000 184.997 +23.040000000 23.200000000 311.127 +23.360000000 23.660000000 116.541 +23.700000000 23.860000000 174.614 +23.700000000 23.920000000 277.183 +23.700000000 23.980000000 207.652 +24.040000000 24.240000000 77.7817 +24.080000000 24.360000000 233.082 +24.240000000 24.380000000 184.997 +24.240000000 24.440000000 311.127 +24.620000000 24.760000000 233.082 +24.560000000 24.820000000 77.7817 +24.740000000 24.860000000 184.997 +24.720000000 24.920000000 311.127 +25.100000000 25.260000000 233.082 +25.040000000 25.360000000 116.541 +25.340000000 25.540000000 174.614 +25.360000000 25.620000000 277.183 +25.380000000 25.640000000 207.652 +25.720000000 25.920000000 77.7817 +25.800000000 26.000000000 233.082 +25.900000000 26.060000000 184.997 +25.920000000 26.100000000 311.127 +26.220000000 26.380000000 77.7817 +26.380000000 26.520000000 184.997 +26.280000000 26.540000000 233.082 +26.380000000 26.600000000 311.127 +26.720000000 26.940000000 116.541 +26.720000000 26.980000000 233.082 +27.000000000 27.220000000 174.614 +27.020000000 27.260000000 207.652 +27.020000000 27.280000000 277.183 +27.320000000 27.600000000 123.471 +27.540000000 27.700000000 233.082 +27.540000000 27.780000000 311.127 +27.860000000 28.040000000 155.563 +28.020000000 28.220000000 233.082 +27.900000000 28.260000000 311.127 +28.320000000 28.800000000 174.614 +28.700000000 28.940000000 311.127 +28.700000000 28.960000000 207.652 +29.020000000 29.240000000 116.541 +29.100000000 29.260000000 233.082 +29.240000000 29.380000000 277.183 +29.220000000 29.440000000 207.652 +29.520000000 29.900000000 277.183 +29.680000000 29.920000000 207.652 +30.000000000 30.420000000 155.563 +30.340000000 30.580000000 184.997 +30.340000000 30.660000000 277.183 +30.700000000 30.900000000 103.826 +30.740000000 30.900000000 207.652 +30.880000000 31.040000000 184.997 +30.900000000 31.080000000 246.942 +31.180000000 31.380000000 123.471 +31.340000000 31.560000000 184.997 +31.360000000 31.580000000 246.942 +31.700000000 32.000000000 277.183 +31.740000000 32.020000000 138.591 +32.020000000 32.260000000 174.614 +32.040000000 32.260000000 246.942 +32.320000000 32.580000000 92.4986 +32.520000000 32.720000000 184.997 +32.560000000 32.740000000 233.082 +32.820000000 33.020000000 92.4986 +33.020000000 33.160000000 184.997 +33.020000000 33.160000000 233.082 +33.440000000 33.560000000 233.082 +33.340000000 33.700000000 116.541 +33.680000000 33.840000000 293.665 +33.660000000 33.960000000 207.652 +33.980000000 34.320000000 123.471 +34.220000000 34.340000000 233.082 +34.200000000 34.380000000 311.127 +34.520000000 34.680000000 155.563 +34.640000000 34.860000000 233.082 +34.620000000 34.900000000 311.127 +35.020000000 35.140000000 349.228 +34.960000000 35.460000000 174.614 +35.320000000 35.600000000 207.652 +35.320000000 35.620000000 311.127 +35.680000000 35.920000000 116.541 +35.840000000 35.960000000 233.082 +35.860000000 36.060000000 277.183 +35.860000000 36.080000000 207.652 +36.240000000 36.360000000 138.591 +36.180000000 36.520000000 277.183 +36.340000000 36.580000000 207.652 +36.660000000 37.200000000 155.563 +37.000000000 37.200000000 184.997 +37.080000000 37.200000000 369.994 +37.000000000 37.220000000 277.183 +37.360000000 37.560000000 207.652 +37.560000000 37.720000000 184.997 +37.560000000 37.760000000 246.942 +37.840000000 38.100000000 123.471 +38.020000000 38.240000000 184.997 +38.060000000 38.280000000 246.942 +38.360000000 38.640000000 277.183 +38.380000000 38.760000000 138.591 +38.680000000 38.900000000 246.942 +38.660000000 38.920000000 174.614 +38.840000000 38.960000000 138.591 +38.980000000 39.280000000 92.4986 +39.260000000 39.380000000 184.997 +39.220000000 39.400000000 233.082 +39.340000000 39.460000000 246.942 +39.500000000 39.760000000 92.4986 +39.600000000 39.820000000 184.997 +39.660000000 39.880000000 233.082 +40.000000000 40.340000000 116.541 +40.360000000 40.520000000 293.665 +40.320000000 40.620000000 207.652 +40.740000000 41.020000000 233.082 +40.700000000 41.080000000 77.7817
--- a/testdata/TRIOS-silvet/take_five/piano_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/piano_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,381 +1,206 @@ -7.520000000 7.640000000 184.997 -7.560000000 7.640000000 466.164 -7.680000000 7.760000000 184.997 -7.560000000 7.920000000 369.994 -8.040000000 8.120000000 1174.66 -8.040000000 8.360000000 184.997 -7.560000000 8.360000000 233.082 -8.080000000 8.360000000 369.994 -8.360000000 8.440000000 466.164 -7.080000000 8.640000000 77.7817 -8.400000000 8.680000000 587.33 -8.400000000 8.680000000 830.609 -8.240000000 8.800000000 116.541 -8.720000000 8.880000000 277.183 -8.680000000 8.920000000 415.305 -8.800000000 9.000000000 174.614 -9.000000000 9.080000000 415.305 -8.560000000 9.120000000 349.228 -8.920000000 9.160000000 116.541 -8.640000000 9.160000000 207.652 -9.240000000 9.360000000 466.164 -9.360000000 9.440000000 311.127 -9.280000000 9.480000000 554.365 -9.440000000 9.560000000 369.994 -9.280000000 9.600000000 184.997 -9.240000000 9.600000000 233.082 -9.760000000 9.880000000 466.164 -9.680000000 10.080000000 184.997 -9.720000000 10.080000000 233.082 -9.720000000 10.120000000 369.994 -8.880000000 10.320000000 77.7817 -10.080000000 10.320000000 587.33 -10.080000000 10.360000000 830.609 -9.920000000 10.560000000 116.541 -10.360000000 10.600000000 415.305 -10.440000000 10.680000000 174.614 -10.280000000 10.760000000 349.228 -10.680000000 10.760000000 415.305 -10.600000000 10.800000000 116.541 -10.320000000 10.840000000 207.652 -10.920000000 11.160000000 184.997 -11.120000000 11.240000000 554.365 -10.920000000 11.280000000 233.082 -10.960000000 11.280000000 369.994 -11.400000000 11.520000000 622.254 -11.400000000 11.560000000 184.997 -11.520000000 11.720000000 554.365 -11.320000000 11.760000000 233.082 -11.440000000 11.800000000 369.994 -11.720000000 12.000000000 830.609 -10.560000000 12.040000000 77.7817 -11.760000000 12.040000000 587.33 -11.600000000 12.160000000 116.541 -12.040000000 12.200000000 277.183 -12.000000000 12.240000000 207.652 -12.160000000 12.360000000 174.614 -11.960000000 12.400000000 349.228 -12.040000000 12.440000000 415.305 -12.240000000 12.520000000 116.541 -12.360000000 12.520000000 207.652 -12.560000000 12.680000000 554.365 -12.600000000 12.720000000 1318.51 -12.680000000 12.920000000 184.997 -12.560000000 12.920000000 233.082 -12.560000000 12.960000000 369.994 -13.040000000 13.240000000 554.365 -13.240000000 13.320000000 466.164 -13.080000000 13.360000000 184.997 -13.040000000 13.400000000 233.082 -13.080000000 13.440000000 369.994 -13.400000000 13.600000000 587.33 -12.200000000 13.680000000 77.7817 -13.400000000 13.680000000 830.609 -13.320000000 13.760000000 116.541 -13.720000000 13.800000000 138.591 -13.680000000 13.800000000 415.305 -13.800000000 13.880000000 277.183 -13.760000000 13.880000000 349.228 -13.720000000 14.040000000 174.614 -13.840000000 14.040000000 415.305 -13.880000000 14.160000000 116.541 -13.680000000 14.160000000 207.652 -14.240000000 14.440000000 184.997 -14.200000000 14.560000000 233.082 -14.440000000 14.560000000 554.365 -14.240000000 14.600000000 369.994 -14.560000000 14.640000000 466.164 -14.720000000 14.880000000 466.164 -14.760000000 14.960000000 184.997 -14.720000000 15.040000000 233.082 -14.720000000 15.040000000 369.994 -13.880000000 15.280000000 77.7817 -15.120000000 15.280000000 349.228 -15.040000000 15.320000000 587.33 -15.040000000 15.320000000 830.609 -15.320000000 15.400000000 174.614 -15.400000000 15.520000000 277.183 -14.920000000 15.560000000 116.541 -15.520000000 15.720000000 174.614 -15.320000000 15.760000000 415.305 -15.320000000 15.840000000 207.652 -15.320000000 15.840000000 349.228 -15.880000000 15.960000000 554.365 -15.920000000 16.000000000 622.254 -15.960000000 16.160000000 184.997 -15.880000000 16.280000000 233.082 -15.880000000 16.280000000 369.994 -16.320000000 16.480000000 184.997 -16.360000000 16.480000000 466.164 -16.480000000 16.560000000 622.254 -16.520000000 16.680000000 184.997 -16.400000000 16.720000000 233.082 -16.400000000 16.800000000 369.994 -15.560000000 16.960000000 77.7817 -16.720000000 17.040000000 587.33 -16.720000000 17.040000000 830.609 -17.040000000 17.200000000 277.183 -16.600000000 17.240000000 116.541 -17.200000000 17.280000000 174.614 -17.040000000 17.440000000 415.305 -16.960000000 17.480000000 207.652 -16.960000000 17.480000000 349.228 -17.280000000 17.520000000 116.541 -17.560000000 17.680000000 184.997 -17.560000000 17.680000000 622.254 -17.680000000 17.760000000 554.365 -17.760000000 17.960000000 184.997 -17.560000000 17.960000000 233.082 -17.560000000 17.960000000 369.994 -18.080000000 18.200000000 184.997 -18.200000000 18.280000000 155.563 -18.080000000 18.320000000 233.082 -18.080000000 18.320000000 554.365 -18.080000000 18.400000000 369.994 -18.320000000 18.440000000 184.997 -17.240000000 18.640000000 77.7817 -18.400000000 18.680000000 830.609 -18.400000000 18.720000000 587.33 -18.280000000 18.760000000 116.541 -18.720000000 18.880000000 277.183 -18.760000000 19.000000000 174.614 -19.000000000 19.120000000 116.541 -18.680000000 19.120000000 415.305 -18.640000000 19.160000000 207.652 -18.640000000 19.160000000 349.228 -19.280000000 19.360000000 622.254 -19.280000000 19.440000000 184.997 -19.400000000 19.560000000 554.365 -19.240000000 19.600000000 233.082 -19.240000000 19.640000000 369.994 -19.760000000 19.840000000 1318.51 -19.760000000 20.040000000 369.994 -19.720000000 20.120000000 184.997 -19.720000000 20.120000000 233.082 -18.920000000 20.320000000 77.7817 -20.160000000 20.360000000 587.33 -20.080000000 20.360000000 830.609 -20.360000000 20.440000000 174.614 -20.360000000 20.480000000 349.228 -20.440000000 20.520000000 277.183 -20.360000000 20.520000000 415.305 -20.480000000 20.720000000 174.614 -20.600000000 20.760000000 415.305 -19.920000000 20.800000000 116.541 -20.320000000 20.840000000 207.652 -20.960000000 21.160000000 184.997 -20.960000000 21.240000000 554.365 -20.920000000 21.280000000 233.082 -20.920000000 21.280000000 369.994 -21.400000000 21.480000000 622.254 -21.400000000 21.560000000 554.365 -21.480000000 21.720000000 184.997 -21.400000000 21.720000000 233.082 -21.400000000 21.720000000 369.994 -21.760000000 22.000000000 587.33 -20.520000000 22.040000000 77.7817 -21.760000000 22.040000000 830.609 -22.080000000 22.160000000 138.591 -21.600000000 22.200000000 116.541 -22.160000000 22.400000000 174.614 -21.880000000 22.440000000 349.228 -22.040000000 22.440000000 415.305 -22.000000000 22.520000000 207.652 -22.560000000 22.680000000 233.082 -22.600000000 22.720000000 622.254 -22.760000000 22.840000000 233.082 -22.640000000 22.880000000 554.365 -22.680000000 22.920000000 184.997 -22.840000000 22.920000000 466.164 -22.600000000 22.960000000 369.994 -23.040000000 23.160000000 466.164 -23.000000000 23.280000000 184.997 -23.080000000 23.400000000 369.994 -23.240000000 23.400000000 554.365 -23.000000000 23.440000000 233.082 -23.400000000 23.640000000 587.33 -23.400000000 23.680000000 830.609 -22.200000000 23.720000000 77.7817 -23.280000000 23.920000000 116.541 -23.800000000 24.040000000 174.614 -23.680000000 24.120000000 415.305 -24.040000000 24.160000000 116.541 -23.640000000 24.160000000 207.652 -23.640000000 24.160000000 349.228 -24.240000000 24.360000000 466.164 -24.240000000 24.400000000 554.365 -24.280000000 24.440000000 184.997 -24.440000000 24.560000000 554.365 -24.240000000 24.600000000 233.082 -24.360000000 24.600000000 369.994 -24.720000000 24.800000000 622.254 -24.720000000 24.920000000 184.997 -24.720000000 25.000000000 233.082 -24.800000000 25.000000000 554.365 -24.760000000 25.120000000 369.994 -25.040000000 25.160000000 587.33 -23.920000000 25.280000000 77.7817 -25.040000000 25.320000000 830.609 -25.240000000 25.360000000 587.33 -25.400000000 25.480000000 138.591 -24.920000000 25.560000000 116.541 -25.480000000 25.680000000 174.614 -25.680000000 25.760000000 116.541 -25.320000000 25.800000000 415.305 -25.320000000 25.840000000 349.228 -25.320000000 25.880000000 207.652 -25.880000000 25.960000000 184.997 -25.920000000 26.000000000 466.164 -25.960000000 26.040000000 311.127 -26.000000000 26.120000000 184.997 -25.920000000 26.280000000 369.994 -26.360000000 26.560000000 184.997 -25.960000000 26.720000000 233.082 -26.400000000 26.720000000 554.365 -26.400000000 26.760000000 369.994 -25.560000000 26.960000000 77.7817 -26.760000000 27.000000000 587.33 -26.720000000 27.000000000 830.609 -27.000000000 27.160000000 415.305 -27.040000000 27.240000000 277.183 -26.560000000 27.360000000 116.541 -27.160000000 27.360000000 174.614 -26.840000000 27.400000000 349.228 -27.240000000 27.400000000 415.305 -26.960000000 27.520000000 207.652 -27.400000000 27.520000000 622.254 -27.560000000 27.640000000 1174.66 -27.560000000 27.880000000 311.127 -27.360000000 27.960000000 369.994 -27.360000000 28.000000000 123.471 -27.920000000 28.120000000 466.164 -28.040000000 28.160000000 622.254 -28.240000000 28.320000000 311.127 -27.640000000 28.480000000 155.563 -27.520000000 28.480000000 233.082 -28.360000000 28.920000000 349.228 -28.360000000 29.000000000 174.614 -28.680000000 29.040000000 311.127 -28.680000000 29.120000000 415.305 -29.000000000 29.200000000 349.228 -29.120000000 29.200000000 830.609 -29.040000000 29.240000000 587.33 -29.280000000 29.400000000 138.591 -28.920000000 29.680000000 116.541 -29.720000000 29.920000000 277.183 -29.200000000 30.000000000 415.305 -29.920000000 30.000000000 554.365 -29.440000000 30.120000000 138.591 -30.040000000 30.160000000 466.164 -28.640000000 30.200000000 207.652 -30.200000000 30.360000000 466.164 -30.360000000 30.600000000 277.183 -30.320000000 30.680000000 184.997 -30.360000000 30.680000000 830.609 -30.000000000 30.760000000 155.563 -30.920000000 31.120000000 493.883 -30.880000000 31.160000000 184.997 -30.880000000 31.240000000 246.942 -31.160000000 31.240000000 493.883 -30.600000000 31.280000000 103.826 -30.320000000 31.400000000 369.994 -31.240000000 31.480000000 622.254 -31.360000000 31.680000000 184.997 -31.400000000 31.680000000 493.883 -31.400000000 31.720000000 246.942 -31.120000000 31.840000000 123.471 -31.640000000 32.120000000 138.591 -32.080000000 32.320000000 174.614 -32.240000000 32.400000000 138.591 -31.680000000 32.400000000 415.305 -32.000000000 32.480000000 246.942 -32.400000000 32.520000000 932.328 -32.400000000 32.560000000 277.183 -32.600000000 32.720000000 1174.66 -32.560000000 32.880000000 174.614 -32.880000000 33.000000000 277.183 -32.880000000 33.000000000 932.328 -33.000000000 33.080000000 466.164 -33.080000000 33.160000000 277.183 -32.320000000 33.360000000 92.4986 -33.000000000 33.400000000 174.614 -32.480000000 33.400000000 233.082 -32.000000000 33.600000000 349.228 -33.360000000 33.640000000 830.609 -33.400000000 33.760000000 587.33 -33.760000000 33.840000000 880 -33.680000000 34.040000000 293.665 -33.160000000 34.080000000 116.541 -33.640000000 34.080000000 415.305 -33.640000000 34.120000000 207.652 -34.080000000 34.160000000 739.989 -34.040000000 34.280000000 622.254 -34.360000000 34.560000000 466.164 -34.200000000 34.600000000 311.127 -34.080000000 34.600000000 369.994 -33.960000000 34.640000000 123.471 -34.680000000 34.760000000 622.254 -34.560000000 35.120000000 155.563 -34.160000000 35.120000000 233.082 -35.080000000 35.200000000 1244.51 -35.320000000 35.560000000 415.305 -35.000000000 35.640000000 174.614 -35.280000000 35.720000000 207.652 -35.320000000 35.720000000 311.127 -35.720000000 35.800000000 103.826 -35.000000000 35.880000000 349.228 -35.720000000 35.880000000 587.33 -35.960000000 36.040000000 277.183 -36.080000000 36.160000000 349.228 -35.560000000 36.320000000 116.541 -35.640000000 36.400000000 415.305 -36.400000000 36.520000000 277.183 -36.080000000 36.760000000 138.591 -35.800000000 36.840000000 207.652 -36.800000000 36.920000000 311.127 -36.720000000 37.080000000 466.164 -37.040000000 37.160000000 1318.51 -37.000000000 37.240000000 277.183 -37.160000000 37.320000000 184.997 -37.320000000 37.400000000 554.365 -37.200000000 37.400000000 830.609 -36.640000000 37.480000000 155.563 -36.960000000 37.480000000 369.994 -37.440000000 37.560000000 311.127 -37.560000000 37.680000000 493.883 -37.760000000 37.840000000 493.883 -37.560000000 37.880000000 184.997 -37.560000000 37.920000000 246.942 -37.280000000 37.960000000 103.826 -37.920000000 38.080000000 622.254 -38.080000000 38.280000000 493.883 -38.120000000 38.280000000 554.365 -38.040000000 38.320000000 246.942 -38.280000000 38.360000000 184.997 -37.560000000 38.440000000 369.994 -37.840000000 38.520000000 123.471 -38.680000000 39.000000000 174.614 -38.320000000 39.040000000 415.305 -38.320000000 39.080000000 138.591 -38.640000000 39.120000000 246.942 -39.040000000 39.200000000 932.328 -39.080000000 39.280000000 277.183 -39.280000000 39.360000000 466.164 -38.680000000 39.560000000 349.228 -39.280000000 39.680000000 174.614 -39.680000000 39.840000000 277.183 -39.800000000 39.920000000 466.164 -39.680000000 39.960000000 349.228 -39.200000000 40.040000000 233.082 -39.880000000 40.080000000 174.614 -39.000000000 40.160000000 92.4986 -40.040000000 40.280000000 830.609 -40.080000000 40.360000000 587.33 -40.360000000 40.440000000 880 -40.280000000 40.680000000 415.305 -39.920000000 40.720000000 116.541 -40.320000000 40.720000000 293.665 -40.320000000 40.800000000 207.652 -40.520000000 41.520000000 77.7817 -45.920000000 46.000000000 523.251 -45.840000000 46.000000000 1396.91 +7.080000000 7.440000000 82.4069 +7.480000000 7.720000000 82.4069 +7.540000000 7.940000000 184.997 +7.540000000 7.940000000 233.082 +8.020000000 8.180000000 184.997 +8.200000000 8.380000000 184.997 +8.040000000 8.380000000 233.082 +7.080000000 8.540000000 77.7817 +8.340000000 8.740000000 116.541 +8.740000000 8.860000000 277.183 +8.720000000 8.920000000 174.614 +8.680000000 9.060000000 415.305 +8.660000000 9.080000000 349.228 +8.700000000 9.120000000 207.652 +9.240000000 9.420000000 184.997 +9.240000000 9.500000000 233.082 +9.420000000 9.540000000 369.994 +9.720000000 9.880000000 184.997 +9.700000000 10.040000000 233.082 +9.000000000 10.160000000 77.7817 +10.380000000 10.500000000 349.228 +10.020000000 10.540000000 116.541 +10.420000000 10.560000000 174.614 +10.440000000 10.680000000 415.305 +10.600000000 10.720000000 174.614 +10.400000000 10.760000000 207.652 +10.940000000 11.100000000 184.997 +11.420000000 11.540000000 184.997 +11.560000000 11.680000000 184.997 +10.680000000 11.820000000 77.7817 +11.700000000 12.040000000 116.541 +12.060000000 12.320000000 415.305 +12.220000000 12.360000000 174.614 +12.080000000 12.380000000 207.652 +12.580000000 12.700000000 184.997 +12.580000000 12.700000000 233.082 +12.740000000 12.860000000 184.997 +13.100000000 13.220000000 184.997 +13.100000000 13.340000000 233.082 +12.340000000 13.460000000 77.7817 +13.360000000 13.700000000 116.541 +13.700000000 13.820000000 415.305 +13.840000000 13.980000000 415.305 +13.860000000 14.000000000 174.614 +13.700000000 14.060000000 207.652 +14.220000000 14.360000000 233.082 +14.260000000 14.440000000 184.997 +14.380000000 14.520000000 233.082 +14.760000000 14.880000000 184.997 +14.720000000 15.000000000 233.082 +14.020000000 15.100000000 77.7817 +15.020000000 15.440000000 116.541 +15.400000000 15.620000000 415.305 +15.380000000 15.720000000 207.652 +15.380000000 15.740000000 349.228 +15.900000000 16.040000000 184.997 +15.980000000 16.220000000 233.082 +16.420000000 16.540000000 184.997 +16.540000000 16.680000000 233.082 +15.700000000 16.780000000 77.7817 +16.700000000 17.120000000 116.541 +17.040000000 17.160000000 349.228 +17.020000000 17.320000000 415.305 +17.120000000 17.360000000 174.614 +17.060000000 17.420000000 207.652 +17.600000000 17.760000000 233.082 +17.580000000 17.860000000 184.997 +18.140000000 18.300000000 184.997 +17.340000000 18.440000000 77.7817 +18.360000000 18.700000000 116.541 +18.700000000 18.880000000 349.228 +18.720000000 19.000000000 415.305 +18.900000000 19.040000000 174.614 +18.720000000 19.040000000 207.652 +19.280000000 19.400000000 184.997 +19.260000000 19.520000000 233.082 +19.760000000 19.880000000 184.997 +19.740000000 20.040000000 233.082 +19.040000000 20.100000000 77.7817 +20.040000000 20.440000000 116.541 +20.380000000 20.500000000 415.305 +20.440000000 20.560000000 174.614 +20.520000000 20.660000000 415.305 +20.580000000 20.700000000 174.614 +20.420000000 20.740000000 207.652 +20.940000000 21.060000000 184.997 +20.920000000 21.160000000 233.082 +21.100000000 21.220000000 184.997 +21.400000000 21.520000000 233.082 +21.420000000 21.600000000 184.997 +21.560000000 21.700000000 233.082 +20.700000000 21.740000000 77.7817 +21.700000000 22.060000000 116.541 +22.080000000 22.280000000 174.614 +22.060000000 22.300000000 415.305 +22.060000000 22.360000000 207.652 +22.620000000 22.760000000 184.997 +23.060000000 23.180000000 184.997 +23.040000000 23.380000000 233.082 +22.360000000 23.440000000 77.7817 +23.360000000 23.780000000 116.541 +23.700000000 23.840000000 349.228 +23.700000000 23.940000000 415.305 +23.720000000 24.060000000 207.652 +24.260000000 24.400000000 233.082 +24.260000000 24.560000000 184.997 +24.760000000 24.960000000 184.997 +24.820000000 25.040000000 233.082 +24.000000000 25.140000000 77.7817 +25.040000000 25.400000000 116.541 +25.380000000 25.540000000 349.228 +25.380000000 25.600000000 415.305 +25.620000000 25.740000000 174.614 +25.400000000 25.760000000 207.652 +25.920000000 26.040000000 184.997 +25.940000000 26.240000000 233.082 +26.400000000 26.520000000 233.082 +26.520000000 26.680000000 184.997 +25.720000000 26.740000000 77.7817 +26.700000000 27.060000000 116.541 +27.040000000 27.260000000 415.305 +27.060000000 27.420000000 207.652 +27.360000000 27.840000000 123.471 +27.540000000 27.900000000 233.082 +27.880000000 28.340000000 155.563 +28.020000000 28.380000000 233.082 +28.380000000 28.520000000 174.614 +28.420000000 28.560000000 349.228 +28.600000000 28.720000000 349.228 +28.700000000 29.000000000 415.305 +28.680000000 29.060000000 207.652 +29.000000000 29.480000000 116.541 +29.240000000 29.580000000 207.652 +29.380000000 29.660000000 415.305 +29.600000000 29.800000000 138.591 +29.760000000 29.880000000 277.183 +29.680000000 29.900000000 415.305 +29.720000000 30.120000000 207.652 +30.040000000 30.300000000 155.563 +30.340000000 30.460000000 184.997 +30.380000000 30.520000000 277.183 +30.380000000 30.640000000 155.563 +30.900000000 31.100000000 246.942 +30.900000000 31.140000000 184.997 +30.760000000 31.160000000 103.826 +31.480000000 31.600000000 246.942 +31.120000000 31.740000000 123.471 +31.740000000 32.000000000 138.591 +32.060000000 32.180000000 174.614 +31.700000000 32.300000000 415.305 +32.200000000 32.360000000 174.614 +32.040000000 32.400000000 246.942 +32.700000000 32.820000000 174.614 +32.540000000 32.940000000 233.082 +32.360000000 33.200000000 92.4986 +33.100000000 33.240000000 174.614 +33.040000000 33.320000000 233.082 +33.260000000 33.800000000 116.541 +33.700000000 33.900000000 293.665 +33.740000000 34.000000000 415.305 +33.680000000 34.080000000 207.652 +34.300000000 34.420000000 311.127 +34.000000000 34.540000000 123.471 +34.200000000 34.540000000 233.082 +34.580000000 35.000000000 155.563 +34.560000000 35.080000000 233.082 +35.100000000 35.320000000 174.614 +35.340000000 35.480000000 415.305 +35.360000000 35.500000000 311.127 +35.380000000 35.500000000 349.228 +35.560000000 35.680000000 174.614 +35.320000000 35.720000000 207.652 +35.940000000 36.060000000 277.183 +35.660000000 36.140000000 116.541 +35.880000000 36.180000000 207.652 +35.960000000 36.340000000 415.305 +36.220000000 36.440000000 138.591 +36.360000000 36.740000000 207.652 +36.680000000 37.020000000 155.563 +37.040000000 37.220000000 277.183 +37.080000000 37.220000000 369.994 +37.120000000 37.340000000 155.563 +37.200000000 37.360000000 184.997 +37.580000000 37.700000000 184.997 +37.400000000 37.820000000 103.826 +37.560000000 37.820000000 246.942 +38.100000000 38.240000000 184.997 +38.200000000 38.320000000 246.942 +37.780000000 38.460000000 123.471 +38.380000000 38.600000000 138.591 +38.720000000 38.880000000 349.228 +38.380000000 38.900000000 415.305 +38.680000000 39.020000000 174.614 +38.680000000 39.040000000 246.942 +39.220000000 39.340000000 349.228 +39.040000000 39.400000000 92.4986 +39.320000000 39.540000000 174.614 +39.200000000 39.580000000 233.082 +39.680000000 39.800000000 349.228 +39.780000000 39.980000000 174.614 +39.480000000 40.020000000 92.4986 +39.660000000 40.020000000 233.082 +39.920000000 40.500000000 116.541 +40.400000000 40.580000000 415.305 +40.340000000 40.760000000 207.652 +40.700000000 41.360000000 77.7817
--- a/testdata/TRIOS-silvet/take_five/ride.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/ride.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,416 +1,195 @@ -0.720000000 .840000000 1396.91 -0.720000000 .880000000 1244.51 -0.800000000 .960000000 523.251 -1.040000000 1.120000000 523.251 -0.840000000 1.120000000 1318.51 -1.240000000 1.400000000 830.609 -1.320000000 1.480000000 1318.51 -0.760000000 1.600000000 880 -1.000000000 1.760000000 1244.51 -1.680000000 1.800000000 523.251 -1.680000000 1.800000000 1318.51 -1.520000000 1.920000000 830.609 -1.800000000 1.920000000 1244.51 -1.760000000 1.960000000 880 -1.920000000 2.080000000 1318.51 -1.840000000 2.160000000 523.251 -1.960000000 2.200000000 830.609 -2.240000000 2.320000000 880 -2.360000000 2.440000000 1318.51 -2.280000000 2.480000000 830.609 -2.680000000 2.800000000 830.609 -2.400000000 2.880000000 880 -2.000000000 3.000000000 1244.51 -2.840000000 3.040000000 830.609 -2.320000000 3.160000000 523.251 -2.880000000 3.400000000 1318.51 -3.360000000 3.440000000 880 -3.560000000 3.760000000 830.609 -3.600000000 3.760000000 880 -3.360000000 3.880000000 523.251 -3.960000000 4.120000000 830.609 -4.040000000 4.200000000 880 -4.000000000 4.400000000 523.251 -4.360000000 4.520000000 880 -3.040000000 4.520000000 1244.51 -4.360000000 4.600000000 830.609 -3.440000000 4.760000000 1318.51 -4.640000000 4.800000000 830.609 -4.720000000 4.800000000 1396.91 -4.600000000 4.880000000 1244.51 -4.840000000 4.960000000 830.609 -4.520000000 5.000000000 523.251 -4.960000000 5.160000000 1244.51 -4.840000000 5.360000000 1318.51 -5.800000000 5.880000000 880 -5.520000000 6.040000000 1318.51 -6.040000000 6.120000000 523.251 -6.040000000 6.160000000 880 -6.200000000 6.400000000 1318.51 -6.200000000 6.440000000 523.251 -5.280000000 6.560000000 1244.51 -6.440000000 6.560000000 1318.51 -6.800000000 6.920000000 523.251 -6.760000000 7.040000000 622.254 -7.000000000 7.160000000 369.994 -7.120000000 7.240000000 622.254 -6.600000000 7.280000000 1244.51 -7.240000000 7.320000000 440 -7.360000000 7.440000000 466.164 -6.400000000 7.520000000 880 -7.240000000 7.600000000 369.994 -7.400000000 7.680000000 1244.51 -7.600000000 7.680000000 1318.51 -7.280000000 7.760000000 523.251 -7.600000000 7.800000000 622.254 -7.720000000 7.840000000 369.994 -7.800000000 7.920000000 1318.51 -7.640000000 7.960000000 880 -8.040000000 8.120000000 659.255 -8.000000000 8.480000000 523.251 -8.440000000 8.520000000 622.254 -7.760000000 8.680000000 1244.51 -8.600000000 8.800000000 523.251 -8.080000000 8.880000000 369.994 -8.760000000 8.920000000 622.254 -8.080000000 8.920000000 880 -8.800000000 9.040000000 1244.51 -8.960000000 9.080000000 369.994 -9.280000000 9.360000000 1318.51 -9.040000000 9.440000000 523.251 -9.440000000 9.520000000 1318.51 -9.480000000 9.560000000 1244.51 -9.080000000 9.680000000 880 -9.640000000 9.720000000 1244.51 -9.560000000 9.800000000 523.251 -9.800000000 9.920000000 1318.51 -10.040000000 10.200000000 523.251 -10.040000000 10.200000000 1396.91 -10.040000000 10.280000000 622.254 -9.880000000 10.280000000 880 -10.280000000 10.560000000 523.251 -10.360000000 10.720000000 1244.51 -10.720000000 10.800000000 1396.91 -10.720000000 10.920000000 523.251 -10.800000000 11.000000000 1244.51 -10.720000000 11.040000000 622.254 -10.920000000 11.040000000 1396.91 -11.040000000 11.120000000 523.251 -10.360000000 11.120000000 880 -11.040000000 11.240000000 1244.51 -11.160000000 11.280000000 1318.51 -11.240000000 11.320000000 622.254 -11.320000000 11.400000000 1244.51 -11.200000000 11.480000000 880 -10.720000000 11.520000000 369.994 -11.480000000 11.560000000 391.995 -11.360000000 11.600000000 523.251 -11.440000000 11.680000000 1318.51 -11.600000000 11.840000000 369.994 -11.920000000 12.000000000 391.995 -11.960000000 12.040000000 1396.91 -12.040000000 12.160000000 369.994 -12.000000000 12.240000000 1318.51 -12.080000000 12.280000000 622.254 -11.520000000 12.360000000 1244.51 -12.360000000 12.440000000 659.255 -12.360000000 12.520000000 523.251 -12.440000000 12.520000000 1244.51 -12.520000000 12.600000000 622.254 -12.360000000 12.600000000 1396.91 -12.520000000 12.760000000 1318.51 -12.200000000 12.800000000 369.994 -11.640000000 13.000000000 880 -12.880000000 13.040000000 369.994 -13.000000000 13.080000000 391.995 -12.960000000 13.080000000 1396.91 -13.000000000 13.160000000 523.251 -12.840000000 13.280000000 1244.51 -13.040000000 13.280000000 1318.51 -13.320000000 13.480000000 523.251 -13.400000000 13.480000000 783.991 -13.240000000 13.480000000 880 -13.520000000 13.600000000 932.328 -13.520000000 13.640000000 880 -13.400000000 13.760000000 622.254 -13.680000000 13.800000000 523.251 -13.720000000 14.080000000 880 -14.040000000 14.120000000 523.251 -14.080000000 14.160000000 932.328 -14.120000000 14.200000000 783.991 -14.160000000 14.240000000 880 -14.040000000 14.240000000 1396.91 -14.080000000 14.400000000 622.254 -14.360000000 14.560000000 880 -14.600000000 14.680000000 1396.91 -14.640000000 14.880000000 880 -15.000000000 15.120000000 1396.91 -15.360000000 15.440000000 523.251 -15.400000000 15.600000000 369.994 -15.520000000 15.600000000 523.251 -13.600000000 15.680000000 1244.51 -15.800000000 15.880000000 1318.51 -15.920000000 16.000000000 932.328 -15.680000000 16.120000000 523.251 -15.400000000 16.120000000 880 -16.000000000 16.120000000 1396.91 -15.720000000 16.320000000 369.994 -16.360000000 16.440000000 622.254 -16.280000000 16.520000000 880 -15.760000000 16.640000000 1244.51 -16.560000000 16.640000000 1396.91 -16.640000000 16.720000000 1318.51 -16.680000000 16.760000000 622.254 -16.400000000 16.800000000 369.994 -16.640000000 16.800000000 880 -16.920000000 17.040000000 1396.91 -17.000000000 17.080000000 1760 -16.760000000 17.120000000 1244.51 -17.040000000 17.280000000 369.994 -16.200000000 17.280000000 523.251 -17.360000000 17.440000000 369.994 -17.360000000 17.480000000 622.254 -16.880000000 17.480000000 880 -17.200000000 17.520000000 1244.51 -17.400000000 17.600000000 523.251 -17.520000000 17.680000000 622.254 -17.560000000 17.800000000 880 -17.520000000 17.840000000 369.994 -17.680000000 18.080000000 523.251 -17.960000000 18.160000000 880 -18.360000000 18.440000000 880 -17.680000000 18.520000000 1244.51 -18.200000000 18.640000000 523.251 -18.520000000 19.040000000 880 -19.000000000 19.120000000 523.251 -19.040000000 19.160000000 1318.51 -19.000000000 19.200000000 622.254 -19.200000000 19.280000000 523.251 -19.120000000 19.280000000 880 -19.320000000 19.400000000 1567.98 -17.920000000 19.480000000 369.994 -19.400000000 19.480000000 523.251 -18.640000000 19.680000000 1244.51 -19.680000000 19.760000000 369.994 -19.760000000 19.840000000 932.328 -19.880000000 20.000000000 880 -19.720000000 20.000000000 1244.51 -20.120000000 20.240000000 369.994 -20.200000000 20.440000000 880 -20.360000000 20.560000000 523.251 -20.600000000 20.760000000 523.251 -20.360000000 20.800000000 369.994 -20.760000000 20.840000000 1396.91 -20.680000000 20.880000000 415.305 -20.480000000 20.920000000 880 -20.840000000 20.920000000 1318.51 -20.920000000 21.000000000 932.328 -20.880000000 21.120000000 369.994 -21.040000000 21.160000000 523.251 -21.000000000 21.320000000 880 -21.240000000 21.360000000 523.251 -21.360000000 21.440000000 1318.51 -21.280000000 21.480000000 369.994 -21.480000000 21.560000000 622.254 -21.440000000 21.640000000 880 -21.560000000 21.720000000 369.994 -21.720000000 22.120000000 880 -22.360000000 22.480000000 1396.91 -22.360000000 22.480000000 1567.98 -22.400000000 22.520000000 523.251 -22.160000000 22.560000000 880 -22.520000000 22.680000000 622.254 -22.640000000 22.720000000 830.609 -22.680000000 22.760000000 466.164 -22.720000000 22.800000000 1567.98 -22.720000000 22.840000000 622.254 -22.760000000 23.160000000 830.609 -23.000000000 23.200000000 622.254 -23.040000000 23.200000000 1318.51 -22.640000000 23.280000000 880 -23.320000000 23.400000000 1318.51 -23.320000000 23.480000000 880 -23.480000000 23.560000000 830.609 -23.480000000 23.560000000 1318.51 -23.480000000 23.600000000 1567.98 -23.560000000 23.680000000 523.251 -23.600000000 23.680000000 1396.91 -23.360000000 23.720000000 622.254 -23.560000000 24.120000000 880 -24.040000000 24.160000000 830.609 -24.040000000 24.240000000 523.251 -24.120000000 24.360000000 622.254 -24.360000000 24.440000000 523.251 -20.080000000 24.520000000 1244.51 -24.480000000 24.600000000 622.254 -24.200000000 24.720000000 880 -24.600000000 24.720000000 1396.91 -24.720000000 24.840000000 440 -24.760000000 24.920000000 523.251 -24.800000000 24.960000000 1567.98 -24.840000000 25.000000000 1318.51 -24.960000000 25.120000000 622.254 -24.600000000 25.120000000 1244.51 -25.040000000 25.200000000 440 -25.040000000 25.200000000 523.251 -25.160000000 25.240000000 1318.51 -25.320000000 25.400000000 880 -25.360000000 25.440000000 622.254 -25.360000000 25.440000000 1396.91 -25.200000000 25.600000000 1244.51 -25.360000000 25.680000000 1318.51 -25.680000000 25.800000000 523.251 -25.720000000 25.880000000 1318.51 -25.840000000 25.960000000 1396.91 -25.720000000 26.080000000 1244.51 -26.000000000 26.120000000 1396.91 -25.880000000 26.160000000 523.251 -26.040000000 26.200000000 880 -26.160000000 26.240000000 1318.51 -26.240000000 26.440000000 880 -26.400000000 26.560000000 523.251 -26.200000000 26.640000000 1244.51 -26.760000000 27.040000000 880 -27.120000000 27.200000000 1396.91 -27.160000000 27.320000000 1318.51 -27.240000000 27.440000000 880 -27.360000000 27.440000000 932.328 -27.440000000 27.560000000 1318.51 -27.400000000 27.680000000 1396.91 -27.640000000 27.720000000 830.609 -26.680000000 27.760000000 523.251 -27.480000000 27.800000000 880 -27.880000000 28.240000000 523.251 -28.160000000 28.240000000 1318.51 -28.360000000 28.440000000 523.251 -28.320000000 28.480000000 1567.98 -27.920000000 28.920000000 880 -29.080000000 29.200000000 1396.91 -29.040000000 29.240000000 523.251 -29.640000000 29.720000000 1396.91 -29.000000000 29.800000000 880 -29.280000000 29.960000000 523.251 -30.080000000 30.200000000 622.254 -30.040000000 30.280000000 523.251 -30.200000000 30.280000000 587.33 -29.880000000 30.360000000 880 -30.280000000 30.360000000 1318.51 -30.320000000 30.400000000 622.254 -30.360000000 30.480000000 523.251 -30.400000000 30.480000000 932.328 -30.520000000 30.600000000 391.995 -30.480000000 30.640000000 880 -30.760000000 30.880000000 523.251 -30.720000000 30.920000000 880 -30.920000000 31.000000000 391.995 -31.000000000 31.120000000 1396.91 -30.960000000 31.160000000 523.251 -31.080000000 31.200000000 880 -31.240000000 31.480000000 880 -31.360000000 31.600000000 523.251 -31.720000000 31.800000000 622.254 -31.680000000 31.840000000 830.609 -31.640000000 31.840000000 880 -26.680000000 32.080000000 1244.51 -32.040000000 32.240000000 523.251 -31.920000000 32.240000000 880 -32.040000000 32.280000000 622.254 -32.360000000 32.440000000 523.251 -32.360000000 32.480000000 830.609 -32.360000000 32.480000000 1396.91 -32.560000000 32.640000000 391.995 -32.560000000 32.680000000 622.254 -32.280000000 32.720000000 880 -32.640000000 32.760000000 1396.91 -32.720000000 32.800000000 1318.51 -32.680000000 33.080000000 523.251 -32.120000000 33.160000000 1244.51 -33.120000000 33.200000000 1318.51 -33.160000000 33.280000000 523.251 -33.400000000 33.480000000 622.254 -33.360000000 33.600000000 523.251 -33.560000000 33.640000000 622.254 -33.560000000 33.640000000 1567.98 -33.680000000 33.760000000 523.251 -33.720000000 33.800000000 1567.98 -33.760000000 33.880000000 622.254 -32.760000000 33.880000000 880 -33.880000000 33.960000000 1567.98 -34.040000000 34.120000000 523.251 -34.080000000 34.160000000 622.254 -34.120000000 34.200000000 1318.51 -33.960000000 34.320000000 880 -34.400000000 34.480000000 1567.98 -34.640000000 34.720000000 1318.51 -34.520000000 34.840000000 523.251 -34.800000000 34.880000000 1318.51 -34.960000000 35.080000000 1567.98 -35.160000000 35.240000000 1567.98 -35.080000000 35.280000000 523.251 -34.600000000 35.400000000 880 -35.320000000 35.400000000 1567.98 -33.200000000 35.440000000 1244.51 -35.400000000 35.480000000 622.254 -35.520000000 35.680000000 880 -35.680000000 35.760000000 1567.98 -35.680000000 35.800000000 1396.91 -35.640000000 35.840000000 523.251 -35.840000000 35.920000000 1567.98 -35.840000000 35.960000000 1396.91 -35.720000000 36.040000000 880 -35.960000000 36.080000000 523.251 -36.000000000 36.120000000 1567.98 -36.040000000 36.200000000 622.254 -36.200000000 36.280000000 554.365 -36.200000000 36.360000000 523.251 -36.320000000 36.480000000 830.609 -36.200000000 36.480000000 880 -35.640000000 36.600000000 1244.51 -36.400000000 36.600000000 1567.98 -36.560000000 36.920000000 880 -36.640000000 36.960000000 1244.51 -36.920000000 37.000000000 622.254 -37.040000000 37.160000000 1244.51 -37.160000000 37.480000000 880 -37.360000000 37.560000000 523.251 -37.560000000 37.640000000 1318.51 -37.560000000 37.760000000 880 -38.000000000 38.160000000 523.251 -38.080000000 38.200000000 932.328 -37.200000000 38.480000000 1244.51 -38.400000000 38.520000000 622.254 -38.480000000 38.560000000 523.251 -38.440000000 38.560000000 830.609 -38.440000000 38.600000000 1318.51 -38.640000000 38.760000000 830.609 -38.680000000 38.800000000 523.251 -38.960000000 39.080000000 523.251 -37.960000000 39.120000000 880 -39.040000000 39.160000000 830.609 -39.040000000 39.200000000 622.254 -38.600000000 39.280000000 1244.51 -39.160000000 39.360000000 523.251 -39.160000000 39.400000000 880 -39.160000000 39.400000000 1396.91 -39.400000000 39.560000000 622.254 -39.480000000 39.560000000 1396.91 -39.480000000 39.600000000 880 -39.360000000 39.600000000 1244.51 -39.680000000 39.760000000 523.251 -39.840000000 39.920000000 1318.51 -40.000000000 40.080000000 830.609 -40.040000000 40.120000000 880 -40.160000000 40.280000000 523.251 -40.080000000 40.360000000 1396.91 -40.280000000 40.400000000 369.994 -40.360000000 40.520000000 523.251 -40.240000000 40.520000000 880 -40.560000000 40.640000000 369.994 -40.680000000 40.800000000 523.251 -40.760000000 40.840000000 1396.91 -40.760000000 40.880000000 622.254 -40.800000000 40.920000000 1567.98 -40.880000000 40.960000000 523.251 -40.840000000 41.040000000 880 -41.000000000 41.080000000 1567.98 -39.640000000 41.840000000 1244.51 +0.700000000 .840000000 830.609 +0.720000000 .860000000 523.251 +0.700000000 .900000000 1396.91 +0.800000000 .940000000 880 +0.860000000 .980000000 830.609 +1.020000000 1.140000000 830.609 +0.980000000 1.220000000 880 +1.060000000 1.240000000 1244.51 +1.160000000 1.480000000 830.609 +1.340000000 1.500000000 1244.51 +1.420000000 1.540000000 880 +1.500000000 1.620000000 830.609 +1.520000000 1.680000000 1244.51 +1.680000000 1.960000000 830.609 +0.700000000 2.280000000 1318.51 +2.280000000 2.540000000 523.251 +2.580000000 2.700000000 880 +2.660000000 2.840000000 830.609 +1.960000000 2.960000000 1244.51 +2.700000000 3.040000000 523.251 +3.100000000 3.300000000 1244.51 +3.320000000 3.440000000 523.251 +3.360000000 3.480000000 830.609 +3.340000000 3.620000000 1244.51 +3.600000000 3.720000000 830.609 +3.620000000 3.740000000 880 +3.700000000 3.820000000 523.251 +3.700000000 3.960000000 1244.51 +4.100000000 4.300000000 830.609 +4.340000000 4.520000000 830.609 +4.600000000 4.920000000 830.609 +5.020000000 5.160000000 830.609 +2.320000000 5.360000000 1318.51 +5.500000000 5.620000000 1318.51 +5.540000000 5.660000000 1244.51 +5.740000000 5.900000000 1244.51 +5.680000000 6.100000000 1318.51 +5.940000000 6.200000000 1244.51 +6.120000000 6.560000000 1318.51 +6.660000000 6.800000000 1318.51 +6.960000000 7.180000000 880 +7.120000000 7.380000000 1318.51 +7.360000000 7.480000000 880 +7.520000000 7.640000000 622.254 +7.400000000 7.640000000 1318.51 +7.640000000 7.780000000 369.994 +7.660000000 7.780000000 880 +7.740000000 7.860000000 830.609 +7.760000000 7.920000000 1318.51 +8.000000000 8.300000000 1318.51 +8.360000000 8.480000000 523.251 +8.600000000 8.740000000 523.251 +8.700000000 8.840000000 880 +8.720000000 9.000000000 1318.51 +9.020000000 9.180000000 1318.51 +9.040000000 9.240000000 523.251 +9.340000000 9.540000000 1318.51 +9.600000000 9.800000000 1318.51 +10.020000000 10.220000000 1318.51 +10.260000000 10.520000000 1318.51 +10.460000000 10.580000000 1244.51 +10.720000000 10.840000000 1318.51 +10.760000000 10.900000000 880 +10.860000000 10.980000000 1244.51 +10.940000000 11.140000000 880 +10.900000000 11.180000000 1318.51 +10.900000000 11.440000000 369.994 +11.220000000 11.480000000 880 +11.320000000 11.640000000 1318.51 +11.680000000 11.800000000 880 +11.960000000 12.120000000 1244.51 +11.680000000 12.620000000 1318.51 +12.460000000 12.700000000 369.994 +12.640000000 13.120000000 1318.51 +13.660000000 13.940000000 1244.51 +13.980000000 14.300000000 1244.51 +14.340000000 14.640000000 1244.51 +14.680000000 14.860000000 1244.51 +15.060000000 15.180000000 1244.51 +13.180000000 15.300000000 1318.51 +15.340000000 15.520000000 1244.51 +15.340000000 15.720000000 1318.51 +15.540000000 15.760000000 369.994 +15.700000000 15.860000000 880 +15.800000000 16.180000000 369.994 +15.700000000 16.380000000 1244.51 +15.740000000 16.400000000 1318.51 +16.240000000 16.440000000 880 +16.380000000 16.620000000 369.994 +16.640000000 16.800000000 1318.51 +16.920000000 17.320000000 1318.51 +17.380000000 17.580000000 1318.51 +17.660000000 17.800000000 523.251 +17.640000000 17.820000000 1318.51 +17.940000000 18.060000000 523.251 +17.880000000 18.120000000 1318.51 +18.060000000 18.180000000 369.994 +18.220000000 18.420000000 369.994 +18.300000000 18.640000000 1318.51 +18.600000000 18.800000000 369.994 +18.620000000 18.840000000 1244.51 +18.780000000 18.940000000 1318.51 +18.980000000 19.140000000 1318.51 +18.940000000 19.220000000 1244.51 +19.160000000 19.280000000 369.994 +19.160000000 19.400000000 1318.51 +19.700000000 19.820000000 1318.51 +19.680000000 19.840000000 1244.51 +20.080000000 20.320000000 1318.51 +20.380000000 20.540000000 369.994 +20.680000000 20.940000000 880 +20.060000000 21.000000000 1244.51 +21.040000000 21.160000000 369.994 +20.660000000 21.420000000 1318.51 +21.260000000 21.440000000 1244.51 +21.460000000 21.580000000 1244.51 +21.720000000 21.880000000 1244.51 +21.780000000 22.240000000 1318.51 +22.040000000 22.360000000 1244.51 +22.400000000 22.560000000 880 +22.400000000 22.700000000 1244.51 +22.700000000 22.820000000 880 +22.720000000 22.860000000 830.609 +22.900000000 23.340000000 1244.51 +22.400000000 23.400000000 1318.51 +23.440000000 23.600000000 1318.51 +23.680000000 23.880000000 880 +23.580000000 24.060000000 1244.51 +24.020000000 24.140000000 523.251 +24.120000000 24.380000000 1244.51 +24.260000000 24.400000000 880 +24.720000000 24.840000000 1244.51 +23.620000000 25.340000000 1318.51 +25.400000000 26.020000000 1318.51 +26.360000000 26.480000000 1318.51 +26.840000000 26.960000000 880 +27.000000000 27.120000000 523.251 +26.880000000 27.160000000 1244.51 +27.340000000 27.460000000 523.251 +27.300000000 27.520000000 1244.51 +27.700000000 27.820000000 1244.51 +26.720000000 27.860000000 1318.51 +27.920000000 28.080000000 1244.51 +27.920000000 28.500000000 1318.51 +28.400000000 28.520000000 1244.51 +28.660000000 28.780000000 1318.51 +28.680000000 29.040000000 1244.51 +29.040000000 29.160000000 523.251 +29.060000000 29.180000000 1244.51 +28.920000000 29.340000000 1318.51 +29.220000000 29.440000000 1244.51 +29.620000000 29.740000000 523.251 +29.720000000 29.840000000 1244.51 +30.060000000 30.240000000 1244.51 +29.380000000 30.680000000 1318.51 +30.720000000 30.840000000 880 +30.720000000 31.140000000 1318.51 +31.260000000 31.380000000 880 +30.380000000 31.840000000 1244.51 +32.380000000 32.540000000 1244.51 +32.720000000 32.920000000 1244.51 +31.160000000 33.180000000 1318.51 +33.080000000 33.200000000 1244.51 +33.320000000 33.460000000 1244.51 +33.220000000 33.900000000 1318.51 +34.020000000 34.260000000 1318.51 +33.760000000 34.320000000 1244.51 +34.300000000 34.540000000 1318.51 +34.580000000 35.040000000 1318.51 +34.620000000 35.140000000 1244.51 +35.320000000 35.520000000 1318.51 +35.680000000 35.800000000 523.251 +35.660000000 36.020000000 1318.51 +35.680000000 36.220000000 1244.51 +36.080000000 36.240000000 1318.51 +36.280000000 36.400000000 1244.51 +36.300000000 36.420000000 1318.51 +36.420000000 36.580000000 1244.51 +36.500000000 36.620000000 1318.51 +36.640000000 36.800000000 1244.51 +36.740000000 36.860000000 1318.51 +36.880000000 37.000000000 1318.51 +37.360000000 37.620000000 1318.51 +38.020000000 38.140000000 880 +37.340000000 38.440000000 1244.51 +39.000000000 39.120000000 1244.51 +39.200000000 39.320000000 880 +37.660000000 39.340000000 1318.51 +39.420000000 39.580000000 1244.51 +39.700000000 39.900000000 1244.51 +39.680000000 39.960000000 1318.51 +40.040000000 40.900000000 1244.51 +40.000000000 41.100000000 1318.51 +40.980000000 41.120000000 1244.51 +41.220000000 41.340000000 1244.51
--- a/testdata/TRIOS-silvet/take_five/ride_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/ride_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,284 +1,130 @@ -0.720000000 .880000000 1396.91 -0.680000000 .920000000 1661.22 -0.680000000 1.440000000 622.254 -1.400000000 1.520000000 523.251 -1.000000000 1.520000000 1661.22 -1.680000000 1.840000000 1661.22 -2.000000000 2.200000000 1661.22 -2.400000000 2.520000000 523.251 -2.400000000 2.520000000 659.255 -1.520000000 2.800000000 622.254 -2.360000000 2.800000000 1661.22 -2.760000000 2.840000000 1396.91 -2.880000000 2.960000000 622.254 -2.680000000 3.000000000 523.251 -3.000000000 3.120000000 1396.91 -2.960000000 3.200000000 1661.22 -3.040000000 3.520000000 622.254 -3.560000000 3.640000000 1396.91 -3.240000000 3.640000000 1661.22 -3.600000000 3.720000000 523.251 -4.000000000 4.080000000 523.251 -4.000000000 4.160000000 1396.91 -4.160000000 4.240000000 523.251 -4.320000000 4.400000000 523.251 -3.720000000 4.440000000 1661.22 -4.680000000 4.760000000 523.251 -4.600000000 4.840000000 1661.22 -4.920000000 5.040000000 1661.22 -5.000000000 5.120000000 523.251 -5.080000000 5.240000000 1661.22 -5.280000000 5.520000000 1661.22 -3.560000000 5.600000000 622.254 -5.720000000 5.800000000 659.255 -5.680000000 5.840000000 523.251 -5.840000000 5.920000000 1396.91 -5.760000000 5.920000000 1661.22 -6.040000000 6.120000000 1396.91 -6.080000000 6.160000000 523.251 -5.720000000 6.200000000 622.254 -6.000000000 6.200000000 1661.22 -6.440000000 6.520000000 1661.22 -6.640000000 6.800000000 1661.22 -6.840000000 6.920000000 523.251 -7.080000000 7.160000000 1396.91 -6.920000000 7.200000000 1661.22 -6.400000000 7.240000000 622.254 -7.280000000 7.520000000 622.254 -7.400000000 7.560000000 523.251 -7.520000000 7.600000000 1396.91 -7.360000000 7.880000000 1661.22 -7.560000000 7.920000000 622.254 -8.040000000 8.200000000 523.251 -8.040000000 8.200000000 1661.22 -7.960000000 8.240000000 622.254 -8.280000000 8.440000000 622.254 -8.360000000 8.480000000 523.251 -8.360000000 8.720000000 1661.22 -8.640000000 8.800000000 523.251 -9.080000000 9.160000000 1396.91 -9.040000000 9.240000000 523.251 -9.320000000 9.440000000 523.251 -9.400000000 9.480000000 1396.91 -8.480000000 9.640000000 622.254 -9.680000000 9.840000000 523.251 -9.040000000 9.840000000 1661.22 -9.720000000 10.000000000 622.254 -10.000000000 10.200000000 1661.22 -10.040000000 10.280000000 622.254 -10.400000000 10.520000000 523.251 -10.400000000 10.600000000 1661.22 -10.680000000 10.920000000 523.251 -10.760000000 10.920000000 1396.91 -10.640000000 11.120000000 1661.22 -11.280000000 11.360000000 1396.91 -11.280000000 11.480000000 1661.22 -11.320000000 11.520000000 523.251 -11.680000000 11.760000000 1396.91 -11.680000000 12.200000000 1661.22 -12.360000000 12.480000000 523.251 -12.320000000 12.520000000 1661.22 -12.360000000 12.560000000 1396.91 -12.680000000 12.760000000 1396.91 -12.560000000 12.840000000 1661.22 -12.640000000 13.040000000 523.251 -13.040000000 13.120000000 1396.91 -12.880000000 13.200000000 1661.22 -13.360000000 13.480000000 523.251 -10.360000000 13.760000000 622.254 -13.680000000 13.800000000 523.251 -13.680000000 13.800000000 1396.91 -13.680000000 13.880000000 1661.22 +0.680000000 .800000000 1318.51 +0.700000000 .860000000 1396.91 +0.700000000 .880000000 523.251 +0.680000000 .940000000 1661.22 +1.020000000 1.140000000 1661.22 +0.780000000 1.300000000 622.254 +1.280000000 1.400000000 1661.22 +1.320000000 1.580000000 622.254 +1.640000000 1.880000000 622.254 +2.020000000 2.140000000 622.254 +2.360000000 2.560000000 1661.22 +2.360000000 2.940000000 622.254 +2.980000000 3.200000000 622.254 +3.340000000 3.460000000 622.254 +3.560000000 3.780000000 622.254 +4.000000000 4.120000000 1396.91 +4.000000000 4.120000000 1661.22 +4.100000000 4.460000000 622.254 +4.680000000 4.820000000 622.254 +5.020000000 5.140000000 622.254 +5.320000000 5.460000000 622.254 +5.480000000 5.600000000 622.254 +5.680000000 5.920000000 622.254 +6.060000000 6.180000000 622.254 +6.680000000 6.820000000 622.254 +7.040000000 7.180000000 622.254 +7.360000000 7.480000000 1396.91 +7.340000000 7.640000000 622.254 +8.360000000 8.480000000 622.254 +8.520000000 8.640000000 622.254 +8.680000000 8.880000000 622.254 +9.060000000 9.240000000 1661.22 +9.020000000 9.420000000 622.254 +9.540000000 9.820000000 622.254 +10.060000000 10.180000000 622.254 +10.680000000 10.800000000 523.251 +10.700000000 10.820000000 1661.22 +10.680000000 11.000000000 622.254 +11.060000000 11.320000000 622.254 +11.360000000 11.500000000 622.254 +12.000000000 12.120000000 622.254 +12.360000000 12.480000000 1661.22 +12.320000000 12.600000000 622.254 +12.640000000 12.820000000 622.254 +12.940000000 13.160000000 622.254 +13.340000000 13.520000000 622.254 14.040000000 14.160000000 523.251 -14.040000000 14.240000000 1396.91 -13.880000000 14.400000000 622.254 -14.080000000 14.480000000 1661.22 -14.440000000 14.520000000 1396.91 -14.520000000 14.600000000 523.251 -14.680000000 14.760000000 523.251 -14.520000000 14.880000000 622.254 -14.560000000 14.920000000 1661.22 -15.000000000 15.200000000 1661.22 -15.120000000 15.240000000 523.251 -15.360000000 15.440000000 1396.91 -15.320000000 15.520000000 1661.22 -15.440000000 15.560000000 523.251 -15.720000000 15.880000000 523.251 -15.680000000 15.880000000 1661.22 -14.920000000 16.120000000 622.254 -15.920000000 16.160000000 1661.22 -16.120000000 16.360000000 523.251 -16.240000000 16.360000000 1661.22 -16.240000000 16.400000000 1396.91 -16.400000000 16.560000000 1661.22 -16.640000000 16.720000000 523.251 -16.640000000 16.760000000 1661.22 -16.880000000 17.040000000 523.251 -16.240000000 17.040000000 622.254 -16.960000000 17.080000000 1396.91 -16.800000000 17.200000000 1661.22 -17.320000000 17.400000000 1396.91 -17.360000000 17.520000000 523.251 -17.680000000 17.760000000 1396.91 -17.320000000 17.760000000 1661.22 -17.840000000 18.160000000 1661.22 -17.080000000 18.240000000 622.254 -18.360000000 18.480000000 523.251 -18.360000000 18.480000000 1661.22 -18.640000000 18.720000000 1396.91 -18.600000000 18.880000000 1661.22 -19.000000000 19.120000000 523.251 -19.400000000 19.520000000 523.251 -19.040000000 19.560000000 1661.22 -19.720000000 19.840000000 1661.22 -19.760000000 19.880000000 523.251 -20.040000000 20.160000000 1396.91 -20.280000000 20.360000000 1396.91 -20.080000000 20.480000000 523.251 -20.040000000 20.520000000 1661.22 +14.020000000 14.280000000 622.254 +14.300000000 14.480000000 622.254 +14.660000000 14.840000000 622.254 +15.040000000 15.160000000 622.254 +15.700000000 15.840000000 1661.22 +15.680000000 15.940000000 622.254 +16.320000000 16.480000000 622.254 +16.640000000 16.780000000 622.254 +16.880000000 17.060000000 622.254 +17.340000000 17.460000000 1396.91 +17.320000000 17.520000000 1661.22 +17.340000000 17.660000000 622.254 +17.960000000 18.080000000 622.254 +19.020000000 19.200000000 1661.22 +18.980000000 19.340000000 622.254 +19.360000000 19.480000000 622.254 +20.040000000 20.160000000 622.254 +20.200000000 20.400000000 622.254 20.680000000 20.800000000 1396.91 -20.720000000 20.840000000 523.251 -18.400000000 21.120000000 622.254 -20.680000000 21.320000000 1661.22 -21.200000000 21.360000000 523.251 -21.400000000 21.560000000 1661.22 -21.680000000 21.840000000 523.251 -21.760000000 21.840000000 1396.91 -21.680000000 21.840000000 1661.22 -22.000000000 22.080000000 523.251 -22.000000000 22.120000000 1661.22 -22.360000000 22.480000000 1396.91 -22.680000000 22.760000000 1396.91 -22.360000000 22.760000000 1661.22 -22.920000000 23.000000000 523.251 -22.960000000 23.040000000 1396.91 -21.320000000 23.200000000 622.254 -22.880000000 23.240000000 1661.22 -23.360000000 23.440000000 1396.91 -23.360000000 23.680000000 1661.22 -23.560000000 23.800000000 523.251 -23.240000000 23.920000000 622.254 -24.000000000 24.160000000 1661.22 -24.040000000 24.240000000 523.251 -24.320000000 24.520000000 523.251 -24.000000000 24.600000000 622.254 -24.320000000 24.920000000 1661.22 -25.040000000 25.200000000 1661.22 -25.400000000 25.520000000 1661.22 +20.680000000 20.920000000 1661.22 +20.700000000 20.980000000 622.254 +21.040000000 21.160000000 622.254 +22.120000000 22.240000000 622.254 +22.360000000 22.500000000 622.254 +22.360000000 22.560000000 1661.22 +22.540000000 22.820000000 622.254 +23.400000000 23.520000000 622.254 +23.560000000 23.820000000 622.254 +24.040000000 24.220000000 1661.22 +24.040000000 24.320000000 622.254 +24.360000000 24.520000000 622.254 +24.600000000 24.720000000 622.254 +25.040000000 25.180000000 622.254 +25.680000000 25.800000000 523.251 25.720000000 25.840000000 1396.91 -24.680000000 25.920000000 622.254 -25.680000000 25.960000000 523.251 -26.000000000 26.120000000 1396.91 -26.080000000 26.200000000 523.251 -25.680000000 26.200000000 1661.22 -25.960000000 26.480000000 622.254 -26.360000000 26.600000000 1661.22 -26.680000000 26.800000000 523.251 -26.880000000 26.960000000 1396.91 -26.720000000 27.080000000 1661.22 -26.840000000 27.120000000 523.251 -26.520000000 27.240000000 622.254 -27.320000000 27.520000000 622.254 -27.320000000 27.600000000 523.251 -27.760000000 27.840000000 1396.91 -27.320000000 28.200000000 1661.22 -28.360000000 28.440000000 1396.91 -28.440000000 28.560000000 1661.22 -28.680000000 28.880000000 1661.22 -29.000000000 29.120000000 1661.22 -29.040000000 29.200000000 1396.91 -27.600000000 29.400000000 622.254 -29.240000000 29.400000000 1661.22 -29.360000000 29.440000000 1396.91 -29.360000000 29.560000000 523.251 -29.720000000 29.840000000 523.251 -29.440000000 29.840000000 1661.22 -30.040000000 30.160000000 1661.22 -30.240000000 30.320000000 1661.22 -30.240000000 30.360000000 523.251 -30.280000000 30.400000000 1396.91 -29.520000000 30.480000000 622.254 -30.440000000 30.600000000 1661.22 -30.720000000 30.880000000 1396.91 -30.720000000 31.040000000 1661.22 -31.040000000 31.120000000 1396.91 -30.520000000 31.480000000 622.254 -31.200000000 31.520000000 523.251 -31.240000000 31.560000000 1661.22 -31.720000000 31.840000000 1396.91 -31.680000000 31.840000000 1661.22 -32.040000000 32.120000000 1396.91 -32.040000000 32.240000000 523.251 -32.360000000 32.440000000 523.251 -32.440000000 32.560000000 1396.91 -32.720000000 32.800000000 523.251 -32.040000000 32.880000000 1661.22 -33.000000000 33.200000000 1661.22 -33.360000000 33.480000000 1396.91 -33.680000000 33.760000000 1396.91 -33.320000000 33.840000000 1661.22 -34.040000000 34.120000000 523.251 -34.040000000 34.160000000 1396.91 -34.000000000 34.200000000 1661.22 -34.320000000 34.400000000 523.251 -31.560000000 34.480000000 622.254 -34.320000000 34.560000000 1661.22 -34.600000000 34.800000000 622.254 -34.720000000 34.880000000 523.251 -34.720000000 34.880000000 1396.91 -34.680000000 34.880000000 1661.22 -34.840000000 35.160000000 622.254 -35.120000000 35.200000000 523.251 -35.040000000 35.200000000 1661.22 -35.320000000 35.400000000 523.251 -35.320000000 35.440000000 1661.22 -35.680000000 35.840000000 1396.91 -35.760000000 35.880000000 523.251 -36.040000000 36.120000000 1396.91 -35.240000000 36.240000000 622.254 -36.320000000 36.480000000 523.251 -36.400000000 36.480000000 1396.91 -35.680000000 36.480000000 1661.22 -36.280000000 36.840000000 622.254 -36.680000000 37.160000000 1661.22 -37.400000000 37.560000000 523.251 -37.360000000 37.600000000 1661.22 -37.680000000 37.800000000 1396.91 -37.760000000 37.840000000 523.251 -37.680000000 37.840000000 1661.22 -38.000000000 38.200000000 523.251 -37.880000000 38.200000000 1661.22 -36.880000000 38.240000000 622.254 -38.320000000 38.520000000 1661.22 -38.280000000 38.600000000 622.254 -38.640000000 38.720000000 659.255 -38.680000000 38.760000000 1396.91 -38.680000000 38.840000000 1661.22 -38.720000000 38.880000000 622.254 -39.000000000 39.120000000 523.251 -39.040000000 39.200000000 1396.91 -39.360000000 39.440000000 1396.91 -39.440000000 39.520000000 523.251 -39.000000000 39.520000000 1661.22 +25.780000000 25.900000000 1661.22 +25.740000000 25.980000000 622.254 +26.360000000 26.580000000 622.254 +26.680000000 26.920000000 622.254 +27.000000000 27.120000000 622.254 +27.320000000 27.440000000 523.251 +27.340000000 27.480000000 1661.22 +27.420000000 27.580000000 622.254 +27.640000000 27.760000000 622.254 +27.920000000 28.140000000 622.254 +29.040000000 29.160000000 1661.22 +29.040000000 29.340000000 622.254 +30.040000000 30.160000000 622.254 +30.220000000 30.340000000 622.254 +30.700000000 30.880000000 622.254 +30.760000000 30.880000000 1396.91 +30.700000000 30.900000000 1661.22 +30.900000000 31.080000000 622.254 +31.100000000 31.340000000 622.254 +31.780000000 31.900000000 622.254 +32.380000000 32.560000000 1661.22 +32.360000000 32.640000000 622.254 +32.720000000 32.880000000 622.254 +33.580000000 33.840000000 622.254 +34.020000000 34.140000000 1396.91 +34.040000000 34.160000000 1661.22 +34.020000000 34.300000000 622.254 +34.320000000 34.500000000 622.254 +34.720000000 34.860000000 622.254 +35.320000000 35.500000000 622.254 +35.660000000 35.780000000 1396.91 +35.660000000 35.880000000 1661.22 +35.760000000 36.160000000 622.254 +36.340000000 36.560000000 622.254 +36.660000000 37.060000000 622.254 +37.340000000 37.480000000 1396.91 +37.340000000 37.500000000 622.254 +37.880000000 38.020000000 622.254 +38.080000000 38.200000000 622.254 +38.340000000 38.500000000 622.254 +38.660000000 38.840000000 622.254 +39.020000000 39.140000000 1661.22 +39.000000000 39.260000000 622.254 39.680000000 39.800000000 523.251 -39.640000000 39.880000000 1661.22 -38.920000000 40.200000000 622.254 -40.040000000 40.360000000 1661.22 -40.240000000 40.400000000 1396.91 -40.360000000 40.440000000 523.251 -40.400000000 40.520000000 1661.22 -40.280000000 40.640000000 622.254 -40.720000000 40.800000000 523.251 +40.280000000 40.400000000 622.254 40.720000000 40.840000000 1396.91 -40.720000000 41.080000000 1661.22 -40.680000000 41.160000000 622.254 -45.400000000 45.480000000 587.33 -45.440000000 45.520000000 830.609 -45.440000000 45.520000000 932.328 -45.440000000 45.520000000 1244.51 -45.440000000 45.520000000 1479.98 -45.640000000 45.720000000 164.814 -45.640000000 45.720000000 329.628 -45.680000000 45.760000000 622.254 -45.680000000 45.800000000 523.251 -45.680000000 45.800000000 587.33 +40.720000000 40.900000000 1661.22 +40.700000000 41.060000000 622.254
--- a/testdata/TRIOS-silvet/take_five/saxophone.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/saxophone.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,157 +1,109 @@ -13.320000000 13.640000000 233.082 +13.300000000 13.420000000 246.942 +13.340000000 13.660000000 233.082 13.560000000 13.680000000 246.942 13.560000000 13.760000000 311.127 -13.680000000 13.960000000 369.994 -13.880000000 13.960000000 391.995 -13.840000000 14.120000000 415.305 -14.200000000 14.440000000 466.164 -14.000000000 14.640000000 440 -14.680000000 14.760000000 391.995 -14.520000000 14.800000000 415.305 -14.680000000 14.960000000 369.994 -14.960000000 15.480000000 233.082 -15.360000000 15.720000000 277.183 -15.680000000 16.640000000 311.127 -16.640000000 16.840000000 349.228 -16.720000000 16.960000000 369.994 -16.880000000 17.040000000 311.127 -16.960000000 17.040000000 523.251 -16.920000000 17.400000000 277.183 -17.280000000 18.280000000 311.127 -18.480000000 18.560000000 311.127 -18.440000000 18.600000000 293.665 -18.320000000 18.720000000 277.183 -18.560000000 18.800000000 233.082 -18.720000000 18.920000000 622.254 -18.720000000 19.000000000 415.305 -18.640000000 19.120000000 207.652 -18.960000000 20.360000000 233.082 -20.240000000 20.440000000 311.127 -20.440000000 20.520000000 739.989 -20.360000000 20.640000000 369.994 -20.520000000 20.640000000 391.995 -20.560000000 20.800000000 415.305 -20.880000000 21.120000000 466.164 -20.680000000 21.280000000 440 -21.320000000 21.440000000 391.995 -21.200000000 21.440000000 415.305 -21.440000000 21.560000000 739.989 -21.320000000 21.640000000 369.994 -21.680000000 22.200000000 233.082 -22.040000000 22.400000000 277.183 -22.960000000 23.040000000 622.254 -22.360000000 23.240000000 311.127 -23.360000000 23.480000000 261.626 -23.440000000 23.520000000 311.127 -23.360000000 23.560000000 293.665 -23.440000000 23.560000000 554.365 -23.320000000 23.680000000 277.183 -23.520000000 23.760000000 233.082 -23.760000000 23.920000000 622.254 -23.680000000 23.960000000 415.305 -23.640000000 24.040000000 207.652 -23.920000000 24.960000000 233.082 -25.040000000 25.160000000 739.989 -24.960000000 25.280000000 349.228 -25.000000000 25.280000000 369.994 -25.200000000 25.360000000 311.127 -25.280000000 25.360000000 523.251 -25.360000000 25.480000000 554.365 -25.280000000 25.720000000 277.183 -25.600000000 26.720000000 311.127 -27.360000000 27.640000000 622.254 -27.640000000 27.800000000 739.989 -28.040000000 28.120000000 523.251 -27.880000000 28.120000000 622.254 -28.080000000 28.280000000 1479.98 -28.080000000 28.360000000 493.883 -28.320000000 28.640000000 415.305 -28.640000000 28.720000000 932.328 -28.560000000 28.760000000 466.164 -28.720000000 28.880000000 1479.98 -28.720000000 28.920000000 493.883 -28.840000000 29.080000000 523.251 -29.120000000 29.240000000 1661.22 -29.000000000 29.280000000 554.365 -29.240000000 29.320000000 1396.91 -29.240000000 29.400000000 739.989 -29.200000000 29.440000000 698.456 -29.520000000 29.720000000 554.365 -29.800000000 29.880000000 932.328 -29.640000000 30.000000000 466.164 -30.000000000 30.280000000 369.994 -30.160000000 30.280000000 391.995 -30.160000000 30.400000000 415.305 -30.320000000 30.560000000 440 -30.480000000 30.560000000 880 -30.600000000 30.680000000 932.328 -30.480000000 30.760000000 466.164 -30.680000000 30.880000000 1479.98 -30.640000000 30.920000000 493.883 -30.880000000 31.120000000 622.254 -31.240000000 31.320000000 1479.98 -31.160000000 31.400000000 493.883 -31.320000000 31.680000000 415.305 -31.640000000 31.960000000 349.228 -31.840000000 32.040000000 369.994 -31.960000000 32.080000000 391.995 -31.960000000 32.280000000 415.305 -32.240000000 32.360000000 880 -32.160000000 32.400000000 440 -32.560000000 32.680000000 880 -32.520000000 32.720000000 440 -32.760000000 32.840000000 932.328 -32.280000000 32.920000000 466.164 -32.840000000 33.080000000 493.883 -33.040000000 33.120000000 1661.22 -33.400000000 33.520000000 1661.22 -33.600000000 33.680000000 1046.5 -33.520000000 33.760000000 523.251 -33.000000000 33.920000000 554.365 -33.920000000 34.040000000 1174.66 -34.000000000 34.080000000 554.365 -33.880000000 34.080000000 587.33 -34.040000000 34.280000000 622.254 -34.280000000 34.360000000 1479.98 -34.200000000 34.440000000 739.989 -34.560000000 34.720000000 622.254 -34.720000000 34.840000000 1479.98 -34.680000000 35.000000000 493.883 -35.080000000 35.160000000 830.609 -35.000000000 35.320000000 415.305 -35.240000000 35.440000000 466.164 -35.400000000 35.560000000 1479.98 -35.320000000 35.600000000 493.883 -35.520000000 35.720000000 523.251 -35.720000000 35.800000000 1661.22 -35.680000000 35.960000000 554.365 -35.920000000 36.040000000 739.989 -35.880000000 36.080000000 698.456 -36.200000000 36.440000000 554.365 -36.360000000 36.680000000 466.164 -36.680000000 36.960000000 369.994 -36.880000000 36.960000000 391.995 -36.840000000 37.120000000 415.305 -37.000000000 37.240000000 440 -37.160000000 37.240000000 880 -37.200000000 37.440000000 466.164 -37.400000000 37.560000000 1479.98 -37.320000000 37.600000000 493.883 -37.560000000 37.760000000 622.254 -37.960000000 38.040000000 1479.98 -37.840000000 38.080000000 493.883 -38.000000000 38.360000000 415.305 -38.320000000 38.640000000 349.228 -38.560000000 38.720000000 415.305 -38.720000000 38.920000000 1661.22 -38.880000000 38.960000000 523.251 -38.680000000 38.960000000 554.365 -38.920000000 39.040000000 1479.98 -38.880000000 39.080000000 493.883 -39.000000000 40.160000000 466.164 -44.600000000 44.760000000 739.989 -44.760000000 44.840000000 391.995 -44.760000000 44.840000000 415.305 -44.760000000 44.840000000 523.251 -44.760000000 44.840000000 554.365 -44.760000000 44.840000000 659.255 +13.720000000 13.940000000 369.994 +13.680000000 13.940000000 391.995 +13.840000000 14.080000000 415.305 +14.000000000 14.280000000 440 +14.220000000 14.420000000 466.164 +14.340000000 14.620000000 440 +14.540000000 14.760000000 415.305 +14.740000000 14.880000000 369.994 +14.700000000 14.940000000 391.995 +15.020000000 15.400000000 233.082 +15.380000000 15.660000000 277.183 +15.720000000 16.560000000 311.127 +16.680000000 16.820000000 349.228 +16.760000000 16.900000000 369.994 +16.880000000 17.000000000 311.127 +16.980000000 17.340000000 277.183 +17.340000000 18.220000000 311.127 +18.380000000 18.660000000 277.183 +18.620000000 18.740000000 233.082 +18.660000000 19.060000000 207.652 +19.000000000 19.960000000 233.082 +20.060000000 20.320000000 233.082 +20.280000000 20.400000000 311.127 +20.420000000 20.600000000 369.994 +20.540000000 20.740000000 415.305 +20.680000000 20.940000000 440 +20.880000000 21.060000000 466.164 +21.040000000 21.240000000 440 +21.220000000 21.420000000 415.305 +21.340000000 21.460000000 391.995 +21.360000000 21.580000000 369.994 +21.760000000 22.120000000 233.082 +22.080000000 22.320000000 277.183 +22.400000000 23.140000000 311.127 +23.360000000 23.600000000 277.183 +23.560000000 23.700000000 233.082 +23.640000000 23.980000000 207.652 +23.960000000 24.900000000 233.082 +24.980000000 25.120000000 349.228 +25.040000000 25.200000000 369.994 +25.140000000 25.260000000 349.228 +25.220000000 25.340000000 311.127 +25.300000000 25.680000000 277.183 +25.640000000 26.500000000 311.127 +27.380000000 27.600000000 622.254 +27.600000000 27.740000000 739.989 +27.920000000 28.060000000 622.254 +28.060000000 28.340000000 493.883 +28.360000000 28.620000000 415.305 +28.560000000 28.740000000 466.164 +28.700000000 28.900000000 493.883 +28.860000000 29.040000000 523.251 +29.020000000 29.240000000 554.365 +29.220000000 29.400000000 698.456 +29.520000000 29.700000000 554.365 +29.680000000 29.980000000 466.164 +30.020000000 30.220000000 369.994 +30.100000000 30.220000000 391.995 +30.180000000 30.380000000 415.305 +30.320000000 30.540000000 440 +30.520000000 30.720000000 466.164 +30.660000000 30.880000000 493.883 +30.920000000 31.060000000 622.254 +31.180000000 31.360000000 493.883 +31.340000000 31.640000000 415.305 +31.640000000 31.900000000 349.228 +31.860000000 32.000000000 369.994 +31.900000000 32.020000000 391.995 +31.980000000 32.220000000 415.305 +32.180000000 32.320000000 440 +32.300000000 32.560000000 466.164 +32.520000000 32.680000000 440 +32.640000000 32.880000000 466.164 +32.840000000 33.040000000 493.883 +33.020000000 33.220000000 554.365 +33.340000000 33.600000000 554.365 +33.540000000 33.700000000 523.251 +33.680000000 33.900000000 554.365 +33.880000000 34.060000000 587.33 +34.060000000 34.220000000 622.254 +34.220000000 34.400000000 739.989 +34.580000000 34.700000000 622.254 +34.680000000 34.960000000 493.883 +35.020000000 35.240000000 415.305 +35.240000000 35.380000000 466.164 +35.360000000 35.560000000 493.883 +35.520000000 35.700000000 523.251 +35.680000000 35.920000000 554.365 +35.900000000 36.060000000 698.456 +36.220000000 36.400000000 554.365 +36.400000000 36.660000000 466.164 +36.700000000 36.900000000 369.994 +36.720000000 36.920000000 391.995 +36.880000000 37.040000000 415.305 +37.020000000 37.200000000 440 +37.200000000 37.400000000 466.164 +37.380000000 37.580000000 493.883 +37.580000000 37.740000000 622.254 +37.880000000 38.040000000 493.883 +38.040000000 38.320000000 415.305 +38.360000000 38.560000000 349.228 +38.580000000 38.700000000 415.305 +38.680000000 38.940000000 554.365 +38.900000000 39.060000000 493.883 +39.020000000 40.020000000 466.164
--- a/testdata/TRIOS-silvet/take_five/saxophone_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/saxophone_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,204 +1,128 @@ -13.400000000 13.560000000 466.164 -13.320000000 13.640000000 233.082 -13.560000000 13.640000000 293.665 -13.440000000 13.640000000 1174.66 -13.520000000 13.800000000 311.127 -13.760000000 13.920000000 739.989 -13.680000000 14.000000000 369.994 -13.960000000 14.080000000 830.609 -13.880000000 14.160000000 415.305 -14.080000000 14.320000000 880 -14.280000000 14.440000000 932.328 -14.240000000 14.480000000 466.164 -14.480000000 14.560000000 1318.51 +13.300000000 13.420000000 246.942 +13.420000000 13.560000000 466.164 +13.480000000 13.620000000 1174.66 +13.320000000 13.680000000 233.082 +13.520000000 13.780000000 311.127 +13.700000000 14.000000000 369.994 +13.880000000 14.140000000 415.305 +14.060000000 14.280000000 880 +14.280000000 14.400000000 932.328 +14.260000000 14.440000000 466.164 14.400000000 14.600000000 880 -14.040000000 14.680000000 440 -14.600000000 14.720000000 830.609 -14.520000000 14.840000000 415.305 -14.840000000 15.000000000 739.989 -14.680000000 15.040000000 369.994 -15.040000000 15.280000000 466.164 -15.280000000 15.360000000 1244.51 -15.120000000 15.400000000 1174.66 -14.960000000 15.480000000 233.082 -15.320000000 15.800000000 277.183 -15.800000000 15.880000000 1244.51 -15.680000000 16.680000000 311.127 -16.720000000 16.800000000 1396.91 -16.720000000 16.840000000 1760 -16.640000000 16.920000000 349.228 -16.760000000 16.960000000 369.994 -16.840000000 17.080000000 311.127 -16.920000000 17.480000000 277.183 -17.680000000 17.760000000 1244.51 -17.920000000 18.000000000 1244.51 -18.160000000 18.280000000 1244.51 -17.280000000 18.360000000 311.127 -18.440000000 18.640000000 311.127 -18.640000000 18.720000000 466.164 -18.600000000 18.800000000 233.082 -18.320000000 18.800000000 277.183 -18.840000000 19.000000000 415.305 -18.640000000 19.160000000 207.652 -19.040000000 19.200000000 466.164 -19.120000000 19.240000000 698.456 -19.280000000 19.400000000 1244.51 -19.120000000 19.440000000 1174.66 -19.400000000 19.480000000 466.164 -19.480000000 19.560000000 1396.91 -19.600000000 19.760000000 466.164 -20.120000000 20.200000000 466.164 -20.200000000 20.280000000 1396.91 -20.240000000 20.320000000 293.665 -20.200000000 20.320000000 1174.66 -19.000000000 20.400000000 233.082 -20.200000000 20.480000000 311.127 -20.480000000 20.600000000 739.989 -20.360000000 20.680000000 369.994 -20.600000000 20.680000000 830.609 -20.560000000 20.800000000 415.305 -20.720000000 20.960000000 880 -20.920000000 21.120000000 932.328 -20.880000000 21.160000000 466.164 -21.120000000 21.240000000 1318.51 -20.680000000 21.320000000 440 -21.080000000 21.320000000 880 -21.200000000 21.520000000 415.305 -21.400000000 21.600000000 739.989 -21.320000000 21.720000000 369.994 -21.720000000 22.120000000 466.164 -21.760000000 22.120000000 1174.66 -21.680000000 22.200000000 233.082 -22.000000000 22.480000000 277.183 -22.800000000 22.880000000 1244.51 -23.000000000 23.120000000 1244.51 -22.360000000 23.320000000 311.127 -23.400000000 23.640000000 311.127 -23.600000000 23.720000000 466.164 -23.320000000 23.760000000 277.183 -23.560000000 23.800000000 233.082 -23.840000000 23.960000000 415.305 -23.600000000 24.160000000 207.652 -24.040000000 24.160000000 466.164 -24.240000000 24.400000000 466.164 -24.080000000 24.480000000 1174.66 -24.400000000 24.480000000 1396.91 -24.480000000 24.560000000 466.164 -24.000000000 25.000000000 233.082 -25.040000000 25.120000000 1396.91 -25.040000000 25.120000000 1760 -25.040000000 25.240000000 369.994 -24.960000000 25.320000000 349.228 -25.200000000 25.400000000 311.127 -25.360000000 25.480000000 554.365 -25.280000000 25.800000000 277.183 -25.840000000 25.920000000 1244.51 -26.240000000 26.320000000 1244.51 -25.600000000 26.880000000 311.127 -27.440000000 27.640000000 1244.51 -27.400000000 27.680000000 622.254 -27.640000000 27.840000000 739.989 -27.600000000 27.840000000 1479.98 -27.920000000 28.080000000 1244.51 -27.920000000 28.120000000 622.254 -28.080000000 28.200000000 1479.98 -28.080000000 28.440000000 493.883 -28.320000000 28.720000000 415.305 -28.600000000 28.760000000 932.328 -28.560000000 28.800000000 466.164 -28.720000000 28.960000000 493.883 -28.880000000 29.080000000 1046.5 -28.880000000 29.120000000 523.251 -29.040000000 29.280000000 1108.73 -29.040000000 29.320000000 554.365 -29.240000000 29.320000000 1396.91 -29.240000000 29.520000000 698.456 -29.560000000 29.760000000 1108.73 -29.520000000 29.800000000 554.365 -29.680000000 29.920000000 932.328 -29.640000000 30.040000000 466.164 -30.120000000 30.280000000 739.989 -30.000000000 30.320000000 369.994 -30.160000000 30.480000000 415.305 -30.360000000 30.600000000 880 -30.320000000 30.640000000 440 -30.560000000 30.760000000 932.328 -30.520000000 30.800000000 466.164 -30.680000000 30.960000000 493.883 -30.920000000 31.080000000 1244.51 -30.880000000 31.120000000 622.254 -31.120000000 31.440000000 493.883 -31.280000000 31.760000000 415.305 -31.680000000 31.840000000 1396.91 -31.680000000 31.880000000 1760 -31.760000000 31.920000000 698.456 -31.600000000 32.000000000 349.228 -31.840000000 32.080000000 369.994 -32.040000000 32.160000000 830.609 -31.960000000 32.320000000 415.305 -32.280000000 32.360000000 1318.51 -32.240000000 32.400000000 880 -32.360000000 32.600000000 932.328 -32.560000000 32.720000000 880 -32.200000000 32.800000000 440 -32.720000000 32.920000000 932.328 -32.320000000 32.960000000 466.164 -32.840000000 33.080000000 493.883 -33.040000000 33.160000000 1108.73 -33.360000000 33.600000000 1108.73 -33.560000000 33.760000000 523.251 -33.560000000 33.800000000 1046.5 -33.720000000 33.920000000 1108.73 -33.000000000 33.960000000 554.365 -33.880000000 34.120000000 587.33 -33.920000000 34.120000000 1174.66 -34.080000000 34.240000000 1244.51 -34.080000000 34.280000000 622.254 -34.240000000 34.480000000 739.989 -34.240000000 34.480000000 1479.98 -34.560000000 34.640000000 587.33 -34.560000000 34.720000000 622.254 -34.600000000 34.720000000 1244.51 -34.680000000 35.080000000 493.883 -35.040000000 35.200000000 830.609 -35.000000000 35.360000000 415.305 -35.280000000 35.400000000 932.328 -35.240000000 35.480000000 466.164 -35.360000000 35.640000000 493.883 -35.520000000 35.760000000 523.251 -35.560000000 35.800000000 1046.5 -35.720000000 35.960000000 1108.73 -35.680000000 36.000000000 554.365 -35.920000000 36.160000000 698.456 -36.240000000 36.440000000 1108.73 -36.200000000 36.480000000 554.365 -36.440000000 36.720000000 932.328 -36.360000000 36.760000000 466.164 -36.640000000 37.000000000 369.994 -36.920000000 37.000000000 830.609 -36.880000000 37.160000000 415.305 -37.120000000 37.240000000 1318.51 -37.000000000 37.280000000 440 -37.040000000 37.280000000 880 -37.240000000 37.440000000 932.328 -37.200000000 37.480000000 466.164 -37.360000000 37.640000000 493.883 -37.600000000 37.760000000 1244.51 -37.600000000 37.800000000 622.254 -37.840000000 38.120000000 493.883 -38.080000000 38.160000000 1244.51 -38.080000000 38.160000000 1661.22 -38.000000000 38.440000000 415.305 -38.400000000 38.560000000 1396.91 -38.520000000 38.600000000 698.456 -38.400000000 38.600000000 1760 -38.280000000 38.680000000 349.228 -38.600000000 38.720000000 830.609 -38.520000000 38.800000000 415.305 -38.720000000 38.840000000 1108.73 -38.680000000 39.000000000 554.365 -38.880000000 39.120000000 493.883 -39.040000000 40.240000000 932.328 -39.000000000 40.320000000 466.164 -44.600000000 44.680000000 523.251 -44.640000000 44.720000000 659.255 +14.020000000 14.620000000 440 +14.540000000 14.820000000 415.305 +14.740000000 15.000000000 369.994 +15.060000000 15.180000000 466.164 +15.020000000 15.400000000 233.082 +15.360000000 15.740000000 277.183 +15.720000000 16.600000000 311.127 +16.660000000 16.860000000 349.228 +16.780000000 16.920000000 369.994 +16.880000000 17.020000000 311.127 +16.960000000 17.400000000 277.183 +17.340000000 18.300000000 311.127 +18.480000000 18.600000000 311.127 +18.360000000 18.720000000 277.183 +18.640000000 18.760000000 233.082 +18.680000000 19.100000000 207.652 +19.060000000 19.180000000 466.164 +19.020000000 20.000000000 233.082 +20.080000000 20.340000000 233.082 +20.260000000 20.420000000 311.127 +20.400000000 20.640000000 369.994 +20.580000000 20.780000000 415.305 +20.700000000 20.960000000 440 +20.940000000 21.060000000 932.328 +20.900000000 21.100000000 466.164 +21.080000000 21.260000000 880 +21.040000000 21.280000000 440 +21.240000000 21.440000000 415.305 +21.380000000 21.660000000 369.994 +21.740000000 21.900000000 466.164 +21.700000000 22.100000000 233.082 +22.060000000 22.420000000 277.183 +22.400000000 23.240000000 311.127 +23.440000000 23.560000000 311.127 +23.360000000 23.680000000 277.183 +23.600000000 23.720000000 233.082 +23.640000000 24.020000000 207.652 +24.020000000 24.940000000 233.082 +25.060000000 25.220000000 369.994 +25.000000000 25.280000000 349.228 +25.220000000 25.340000000 311.127 +25.300000000 25.720000000 277.183 +25.640000000 26.820000000 311.127 +27.420000000 27.580000000 1244.51 +27.400000000 27.600000000 622.254 +27.620000000 27.760000000 1479.98 +27.620000000 27.800000000 739.989 +27.920000000 28.080000000 622.254 +27.940000000 28.080000000 1244.51 +28.060000000 28.380000000 493.883 +28.360000000 28.660000000 415.305 +28.580000000 28.760000000 466.164 +28.640000000 28.760000000 932.328 +28.720000000 28.940000000 493.883 +28.900000000 29.040000000 1046.5 +28.900000000 29.080000000 523.251 +29.060000000 29.280000000 554.365 +29.240000000 29.460000000 698.456 +29.540000000 29.760000000 554.365 +29.700000000 30.000000000 932.328 +29.680000000 30.020000000 466.164 +30.000000000 30.280000000 369.994 +30.240000000 30.360000000 830.609 +30.200000000 30.420000000 415.305 +30.380000000 30.560000000 880 +30.360000000 30.600000000 440 +30.560000000 30.680000000 932.328 +30.540000000 30.740000000 466.164 +30.680000000 30.920000000 493.883 +30.900000000 31.080000000 622.254 +31.160000000 31.380000000 493.883 +31.320000000 31.680000000 415.305 +31.640000000 31.960000000 349.228 +31.880000000 32.040000000 369.994 +32.000000000 32.260000000 415.305 +32.260000000 32.380000000 880 +32.200000000 32.400000000 440 +32.380000000 32.540000000 932.328 +32.340000000 32.580000000 466.164 +32.600000000 32.720000000 880 +32.540000000 32.740000000 440 +32.700000000 32.820000000 932.328 +32.680000000 32.900000000 466.164 +32.860000000 33.060000000 493.883 +33.060000000 33.260000000 554.365 +33.360000000 33.600000000 554.365 +33.560000000 33.740000000 523.251 +33.720000000 33.920000000 554.365 +33.900000000 34.060000000 587.33 +34.100000000 34.220000000 1244.51 +34.060000000 34.240000000 622.254 +34.240000000 34.360000000 1479.98 +34.680000000 35.020000000 493.883 +35.020000000 35.300000000 415.305 +35.260000000 35.400000000 466.164 +35.380000000 35.580000000 493.883 +35.580000000 35.700000000 1046.5 +35.560000000 35.740000000 523.251 +35.720000000 35.960000000 554.365 +35.940000000 36.120000000 698.456 +36.240000000 36.440000000 554.365 +36.400000000 36.600000000 932.328 +36.380000000 36.700000000 466.164 +36.700000000 36.940000000 369.994 +36.880000000 37.100000000 415.305 +37.040000000 37.260000000 440 +37.240000000 37.360000000 932.328 +37.220000000 37.420000000 466.164 +37.380000000 37.600000000 493.883 +37.580000000 37.700000000 622.254 +37.860000000 38.080000000 493.883 +38.020000000 38.400000000 415.305 +38.340000000 38.620000000 349.228 +38.540000000 38.760000000 415.305 +38.720000000 38.940000000 554.365 +38.920000000 39.080000000 493.883 +39.040000000 40.240000000 466.164
--- a/testdata/TRIOS-silvet/take_five/snare.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/snare.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,213 +1,50 @@ -1.200000000 1.280000000 493.883 -1.240000000 1.320000000 369.994 -1.200000000 1.360000000 311.127 -1.640000000 1.720000000 246.942 -1.520000000 1.720000000 369.994 -1.520000000 1.760000000 311.127 -1.680000000 1.760000000 493.883 -2.240000000 2.320000000 207.652 -2.160000000 2.360000000 311.127 -2.200000000 2.360000000 369.994 -2.880000000 2.960000000 369.994 +1.200000000 1.340000000 311.127 +1.500000000 1.620000000 311.127 +1.560000000 1.700000000 155.563 +1.620000000 1.740000000 369.994 +1.640000000 1.760000000 246.942 +2.200000000 2.340000000 311.127 +2.200000000 2.380000000 369.994 2.880000000 3.000000000 311.127 -3.360000000 3.440000000 207.652 -3.360000000 3.440000000 523.251 -3.320000000 3.480000000 246.942 -3.840000000 3.960000000 246.942 -3.880000000 3.960000000 311.127 -3.880000000 3.960000000 369.994 -4.520000000 4.640000000 246.942 -4.560000000 4.640000000 311.127 -4.920000000 5.000000000 523.251 -4.920000000 5.080000000 246.942 -5.480000000 5.600000000 311.127 -5.560000000 5.640000000 783.991 -5.480000000 5.680000000 246.942 -5.520000000 5.680000000 369.994 -6.120000000 6.240000000 246.942 -6.200000000 6.280000000 311.127 -6.680000000 6.760000000 246.942 -6.560000000 6.760000000 311.127 -6.720000000 6.800000000 369.994 -7.240000000 7.320000000 311.127 -7.240000000 7.320000000 369.994 -7.240000000 7.360000000 246.942 -7.920000000 8.000000000 246.942 -7.920000000 8.000000000 311.127 -7.920000000 8.000000000 587.33 -8.200000000 8.320000000 155.563 -8.360000000 8.440000000 246.942 -8.200000000 8.480000000 311.127 -8.880000000 9.000000000 369.994 -8.920000000 9.000000000 587.33 -8.880000000 9.080000000 311.127 -9.520000000 9.600000000 246.942 -9.520000000 9.640000000 311.127 -10.000000000 10.120000000 246.942 +3.340000000 3.460000000 207.652 +3.340000000 3.460000000 246.942 +3.860000000 3.980000000 311.127 +4.880000000 5.000000000 246.942 +5.480000000 5.620000000 246.942 +5.480000000 5.640000000 369.994 +6.640000000 6.760000000 246.942 +8.880000000 9.020000000 311.127 10.000000000 10.120000000 311.127 -10.000000000 10.120000000 369.994 -10.560000000 10.680000000 246.942 -10.600000000 10.720000000 369.994 -10.560000000 10.760000000 311.127 -11.200000000 11.280000000 369.994 -11.200000000 11.280000000 523.251 -11.200000000 11.320000000 311.127 -11.680000000 11.760000000 207.652 -11.640000000 11.760000000 246.942 -11.640000000 11.760000000 311.127 -11.640000000 11.800000000 369.994 -12.160000000 12.240000000 155.563 -12.160000000 12.280000000 246.942 -12.200000000 12.280000000 369.994 -12.200000000 12.280000000 622.254 -12.880000000 12.960000000 246.942 -12.880000000 12.960000000 311.127 -13.200000000 13.320000000 246.942 -13.200000000 13.320000000 311.127 -13.800000000 13.920000000 369.994 -13.760000000 13.960000000 311.127 -14.480000000 14.560000000 311.127 -14.520000000 14.600000000 103.826 -14.480000000 14.600000000 246.942 -14.840000000 15.040000000 311.127 -14.960000000 15.040000000 369.994 -14.960000000 15.080000000 246.942 -15.560000000 15.640000000 369.994 -15.520000000 15.680000000 246.942 -15.520000000 15.720000000 311.127 -16.200000000 16.280000000 311.127 -16.240000000 16.320000000 246.942 -16.240000000 16.320000000 523.251 -16.520000000 16.720000000 311.127 -16.680000000 16.760000000 207.652 -16.680000000 16.760000000 587.33 -16.640000000 16.800000000 246.942 -16.680000000 16.800000000 369.994 -17.160000000 17.240000000 155.563 -17.200000000 17.280000000 369.994 -17.200000000 17.360000000 246.942 -17.840000000 17.960000000 311.127 -17.880000000 17.960000000 369.994 -18.160000000 18.280000000 246.942 -18.200000000 18.280000000 311.127 -18.200000000 18.280000000 369.994 -18.840000000 18.920000000 523.251 -18.800000000 18.960000000 246.942 -18.840000000 18.960000000 369.994 -18.840000000 19.000000000 311.127 -19.520000000 19.600000000 246.942 -19.560000000 19.640000000 311.127 -19.560000000 19.640000000 369.994 -19.960000000 20.040000000 246.942 -20.000000000 20.080000000 391.995 -19.840000000 20.120000000 311.127 -20.560000000 20.640000000 246.942 -20.560000000 20.680000000 311.127 -20.600000000 20.680000000 493.883 -21.240000000 21.320000000 246.942 -21.240000000 21.360000000 311.127 -21.520000000 21.680000000 311.127 -21.600000000 21.800000000 369.994 -21.640000000 21.840000000 246.942 -22.200000000 22.360000000 246.942 -22.200000000 22.400000000 311.127 -22.920000000 23.000000000 311.127 -22.920000000 23.000000000 369.994 -23.200000000 23.320000000 311.127 -23.360000000 23.440000000 369.994 -23.320000000 23.520000000 246.942 -23.880000000 23.960000000 246.942 -23.880000000 24.000000000 311.127 -23.920000000 24.000000000 523.251 -24.560000000 24.640000000 369.994 -24.880000000 25.000000000 246.942 -24.920000000 25.000000000 369.994 -24.920000000 25.000000000 622.254 -25.480000000 25.600000000 369.994 -25.440000000 25.640000000 246.942 -25.440000000 25.640000000 311.127 -26.160000000 26.240000000 369.994 -26.120000000 26.280000000 311.127 -26.600000000 26.720000000 246.942 -26.480000000 26.760000000 311.127 -27.200000000 27.280000000 466.164 -27.200000000 27.320000000 246.942 -27.200000000 27.320000000 311.127 -27.840000000 27.960000000 246.942 -27.880000000 27.960000000 311.127 -28.200000000 28.280000000 369.994 -28.240000000 28.360000000 311.127 -28.320000000 28.440000000 246.942 -28.840000000 29.000000000 246.942 -28.880000000 29.000000000 369.994 -28.920000000 29.000000000 622.254 -28.840000000 29.040000000 311.127 -28.960000000 29.040000000 698.456 -29.560000000 29.640000000 369.994 -29.560000000 29.640000000 523.251 -29.520000000 29.680000000 246.942 -29.560000000 29.680000000 311.127 -29.880000000 29.960000000 369.994 -30.000000000 30.120000000 311.127 -30.040000000 30.120000000 587.33 -30.040000000 30.160000000 246.942 -30.520000000 30.640000000 246.942 -30.560000000 30.640000000 311.127 -31.240000000 31.320000000 246.942 +10.560000000 10.680000000 155.563 +10.600000000 10.760000000 369.994 +13.220000000 13.340000000 311.127 +15.520000000 15.660000000 246.942 +15.540000000 15.680000000 311.127 +15.560000000 15.680000000 369.994 +15.580000000 15.700000000 587.33 +17.860000000 17.980000000 311.127 +18.820000000 18.960000000 311.127 +22.200000000 22.340000000 246.942 +22.200000000 22.380000000 311.127 +23.880000000 24.000000000 246.942 +25.460000000 25.620000000 246.942 +25.480000000 25.620000000 311.127 +26.140000000 26.260000000 311.127 +26.620000000 26.740000000 246.942 +26.620000000 26.740000000 311.127 +28.840000000 28.980000000 246.942 +28.860000000 29.000000000 311.127 +28.880000000 29.040000000 369.994 +30.000000000 30.120000000 246.942 31.200000000 31.320000000 311.127 -31.240000000 31.320000000 369.994 31.560000000 31.680000000 311.127 -31.600000000 31.680000000 369.994 -32.160000000 32.280000000 369.994 -32.200000000 32.280000000 523.251 -32.160000000 32.320000000 246.942 -32.160000000 32.320000000 311.127 -32.880000000 32.960000000 155.563 -32.880000000 32.960000000 246.942 +32.200000000 32.320000000 246.942 32.880000000 33.000000000 311.127 -33.200000000 33.280000000 369.994 -33.200000000 33.280000000 554.365 -33.200000000 33.360000000 311.127 -33.360000000 33.440000000 369.994 -33.400000000 33.480000000 103.826 -33.320000000 33.480000000 246.942 -33.840000000 33.960000000 246.942 -33.880000000 34.000000000 369.994 -34.520000000 34.600000000 246.942 -34.520000000 34.640000000 311.127 -34.920000000 35.040000000 369.994 +33.200000000 33.320000000 369.994 +34.860000000 35.040000000 369.994 34.960000000 35.080000000 246.942 -34.880000000 35.080000000 311.127 -35.520000000 35.640000000 246.942 -35.520000000 35.680000000 311.127 -35.520000000 35.720000000 369.994 -36.200000000 36.280000000 369.994 -36.200000000 36.280000000 554.365 -36.680000000 36.760000000 207.652 -36.680000000 36.800000000 246.942 -37.160000000 37.240000000 311.127 -37.160000000 37.280000000 246.942 -37.840000000 37.960000000 246.942 -37.840000000 37.960000000 311.127 -37.880000000 37.960000000 369.994 -38.240000000 38.320000000 207.652 -38.200000000 38.360000000 246.942 -38.800000000 38.920000000 311.127 -38.880000000 38.960000000 207.652 -38.760000000 39.000000000 246.942 -38.800000000 39.040000000 369.994 -39.480000000 39.560000000 207.652 -39.480000000 39.560000000 587.33 -39.440000000 39.600000000 246.942 -39.480000000 39.600000000 311.127 -39.960000000 40.080000000 246.942 -40.000000000 40.080000000 311.127 -39.960000000 40.080000000 369.994 -40.560000000 40.640000000 311.127 -40.560000000 40.640000000 369.994 -40.520000000 40.680000000 246.942 -45.080000000 45.160000000 1396.91 -45.120000000 45.200000000 440 -45.120000000 45.200000000 554.365 -45.120000000 45.200000000 739.989 -45.120000000 45.200000000 1108.73 +35.500000000 35.640000000 311.127 +35.520000000 35.640000000 369.994 +38.780000000 38.960000000 246.942 +38.800000000 38.960000000 369.994 +39.460000000 39.580000000 246.942
--- a/testdata/TRIOS-silvet/take_five/snare_syn.lab Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/TRIOS-silvet/take_five/snare_syn.lab Mon Jul 06 09:15:21 2015 +0100 @@ -1,278 +1,79 @@ 1.080000000 1.200000000 164.814 -1.120000000 1.240000000 155.563 -1.200000000 1.280000000 174.614 -1.200000000 1.280000000 523.251 -1.160000000 1.320000000 82.4069 -1.280000000 1.560000000 155.563 -1.520000000 1.600000000 523.251 -1.520000000 1.640000000 77.7817 -1.480000000 1.640000000 82.4069 -1.600000000 1.680000000 87.3071 -1.320000000 1.800000000 164.814 -1.600000000 1.840000000 155.563 -2.040000000 2.120000000 77.7817 -2.120000000 2.200000000 87.3071 -2.200000000 2.280000000 174.614 -2.160000000 2.360000000 82.4069 -2.040000000 2.440000000 164.814 -2.120000000 2.480000000 155.563 -2.840000000 2.920000000 164.814 -2.760000000 3.040000000 82.4069 -3.160000000 3.320000000 82.4069 -3.200000000 3.400000000 174.614 -3.240000000 3.440000000 164.814 -3.400000000 3.480000000 82.4069 -2.760000000 3.560000000 155.563 -3.760000000 3.840000000 82.4069 -3.840000000 3.920000000 174.614 +1.120000000 1.280000000 155.563 +1.180000000 1.440000000 82.4069 +1.440000000 1.560000000 164.814 +1.500000000 1.680000000 82.4069 +1.620000000 1.760000000 164.814 +1.300000000 1.820000000 155.563 +2.160000000 2.300000000 164.814 +2.100000000 2.400000000 155.563 +3.140000000 3.440000000 155.563 3.840000000 3.960000000 164.814 -3.720000000 4.080000000 155.563 -4.560000000 4.640000000 77.7817 -4.400000000 4.680000000 164.814 -4.840000000 5.040000000 164.814 -4.440000000 5.160000000 155.563 -5.400000000 5.520000000 82.4069 -5.520000000 5.640000000 146.832 -5.480000000 5.680000000 174.614 -5.320000000 5.720000000 164.814 -5.400000000 5.760000000 155.563 -6.120000000 6.200000000 164.814 -6.200000000 6.280000000 82.4069 -6.280000000 6.520000000 164.814 -6.040000000 6.640000000 155.563 -6.520000000 6.680000000 82.4069 -6.480000000 6.680000000 174.614 -6.680000000 6.840000000 155.563 -6.560000000 6.840000000 164.814 -7.200000000 7.320000000 82.4069 -7.120000000 7.320000000 164.814 -7.120000000 7.400000000 155.563 -7.800000000 7.880000000 82.4069 -7.960000000 8.120000000 82.4069 -8.160000000 8.240000000 87.3071 -7.880000000 8.240000000 164.814 -8.200000000 8.320000000 82.4069 -8.240000000 8.400000000 174.614 -8.280000000 8.480000000 164.814 -7.800000000 8.560000000 155.563 -8.720000000 8.920000000 164.814 -8.840000000 9.000000000 174.614 -8.920000000 9.000000000 1760 -8.800000000 9.120000000 82.4069 -8.760000000 9.120000000 155.563 -9.480000000 9.600000000 164.814 -9.400000000 9.640000000 82.4069 -9.680000000 9.800000000 82.4069 -9.400000000 9.840000000 155.563 -9.840000000 9.920000000 1760 -9.840000000 10.080000000 174.614 -10.000000000 10.080000000 523.251 -10.080000000 10.160000000 82.4069 -9.800000000 10.160000000 164.814 -9.880000000 10.200000000 155.563 -10.440000000 10.560000000 164.814 -10.560000000 10.640000000 174.614 -10.640000000 10.720000000 87.3071 -10.520000000 10.760000000 82.4069 -10.640000000 10.800000000 164.814 -10.440000000 10.880000000 155.563 -11.120000000 11.200000000 82.4069 -11.200000000 11.320000000 164.814 -11.480000000 11.720000000 174.614 -11.320000000 11.760000000 82.4069 -11.720000000 11.800000000 77.7817 -11.440000000 11.800000000 164.814 -11.120000000 11.880000000 155.563 -12.040000000 12.120000000 164.814 -12.200000000 12.280000000 164.814 -12.120000000 12.320000000 82.4069 -12.040000000 12.400000000 155.563 -12.800000000 12.960000000 82.4069 -12.760000000 12.960000000 155.563 -12.880000000 12.960000000 523.251 -12.840000000 13.040000000 164.814 -13.000000000 13.160000000 82.4069 -13.240000000 13.400000000 164.814 -13.000000000 13.440000000 155.563 -13.680000000 13.880000000 164.814 -13.760000000 13.880000000 174.614 -13.680000000 14.000000000 82.4069 -13.640000000 14.080000000 155.563 -14.400000000 14.520000000 164.814 -14.480000000 14.560000000 554.365 -14.520000000 14.640000000 77.7817 -14.320000000 14.840000000 155.563 -14.720000000 14.880000000 164.814 -14.960000000 15.040000000 174.614 -14.400000000 15.120000000 82.4069 -14.880000000 15.200000000 155.563 -15.600000000 15.680000000 82.4069 -15.520000000 15.680000000 174.614 -15.480000000 15.760000000 164.814 -15.360000000 15.840000000 155.563 -16.160000000 16.400000000 82.4069 -16.520000000 16.600000000 77.7817 -16.520000000 16.600000000 523.251 -16.600000000 16.720000000 174.614 -16.280000000 16.760000000 164.814 -16.600000000 16.880000000 82.4069 -16.120000000 16.880000000 155.563 -17.080000000 17.160000000 164.814 -17.160000000 17.320000000 82.4069 -17.120000000 17.440000000 155.563 -17.760000000 17.960000000 164.814 -17.920000000 18.080000000 82.4069 -18.080000000 18.360000000 164.814 -17.760000000 18.400000000 155.563 -18.640000000 18.960000000 82.4069 -18.680000000 18.960000000 155.563 -18.760000000 19.000000000 174.614 -18.960000000 19.040000000 77.7817 -18.720000000 19.040000000 164.814 -19.040000000 19.120000000 155.563 -19.440000000 19.600000000 164.814 -19.520000000 19.640000000 82.4069 -19.800000000 19.880000000 174.614 -19.880000000 19.960000000 87.3071 -20.040000000 20.120000000 77.7817 -19.400000000 20.160000000 155.563 -19.640000000 20.200000000 164.814 -20.520000000 20.640000000 155.563 -20.640000000 20.720000000 77.7817 -20.640000000 20.720000000 82.4069 -20.480000000 20.760000000 164.814 -21.160000000 21.360000000 164.814 -21.240000000 21.440000000 82.4069 -21.560000000 21.680000000 82.4069 -21.560000000 21.680000000 174.614 -21.720000000 21.840000000 77.7817 -21.120000000 21.840000000 155.563 -21.440000000 21.840000000 164.814 -22.040000000 22.120000000 82.4069 -22.120000000 22.280000000 164.814 -22.200000000 22.360000000 174.614 -22.240000000 22.400000000 82.4069 -22.040000000 22.520000000 155.563 -22.800000000 23.000000000 82.4069 -23.120000000 23.280000000 82.4069 -23.080000000 23.360000000 164.814 -22.800000000 23.400000000 155.563 -23.320000000 23.440000000 82.4069 -23.360000000 23.480000000 77.7817 -23.440000000 23.520000000 164.814 -23.480000000 23.560000000 155.563 -23.760000000 23.840000000 82.4069 -23.840000000 24.040000000 164.814 -23.760000000 24.120000000 155.563 -24.440000000 24.560000000 164.814 -24.560000000 24.680000000 82.4069 -24.400000000 24.680000000 155.563 -24.680000000 24.760000000 77.7817 -24.600000000 24.760000000 164.814 -24.760000000 24.920000000 82.4069 -24.840000000 25.040000000 164.814 -24.760000000 25.120000000 155.563 -25.400000000 25.520000000 82.4069 -25.440000000 25.520000000 523.251 -25.400000000 25.640000000 164.814 -25.520000000 25.640000000 174.614 -25.640000000 25.720000000 82.4069 -25.320000000 25.760000000 155.563 -26.080000000 26.200000000 82.4069 -26.000000000 26.320000000 164.814 -26.360000000 26.480000000 82.4069 -26.440000000 26.520000000 87.3071 -26.640000000 26.760000000 82.4069 -26.480000000 26.800000000 164.814 -26.040000000 26.880000000 155.563 -27.120000000 27.200000000 82.4069 -27.200000000 27.320000000 164.814 -27.080000000 27.440000000 155.563 -27.880000000 27.960000000 77.7817 -27.760000000 27.960000000 82.4069 -27.880000000 28.040000000 164.814 -28.000000000 28.160000000 82.4069 -28.160000000 28.240000000 523.251 -28.160000000 28.360000000 174.614 -28.160000000 28.400000000 164.814 -28.320000000 28.400000000 622.254 -28.240000000 28.480000000 77.7817 -28.400000000 28.480000000 82.4069 -27.760000000 28.560000000 155.563 -28.720000000 28.800000000 164.814 -28.840000000 28.920000000 622.254 -28.840000000 28.960000000 87.3071 -28.880000000 29.040000000 164.814 -28.800000000 29.080000000 82.4069 -28.720000000 29.160000000 155.563 -29.400000000 29.680000000 155.563 -29.600000000 29.720000000 77.7817 -29.800000000 30.000000000 82.4069 -29.920000000 30.080000000 174.614 -30.080000000 30.160000000 77.7817 -29.440000000 30.200000000 164.814 -29.720000000 30.280000000 155.563 -30.400000000 30.640000000 164.814 -30.640000000 30.720000000 82.4069 -30.480000000 30.760000000 155.563 -31.120000000 31.320000000 82.4069 -31.040000000 31.320000000 164.814 -31.400000000 31.480000000 82.4069 -31.480000000 31.680000000 164.814 -31.120000000 31.720000000 155.563 -32.120000000 32.200000000 207.652 -32.040000000 32.240000000 82.4069 -32.080000000 32.280000000 174.614 -32.120000000 32.360000000 164.814 -32.000000000 32.400000000 155.563 -32.800000000 32.920000000 164.814 -32.880000000 33.240000000 82.4069 -33.240000000 33.360000000 164.814 -33.360000000 33.520000000 82.4069 -32.760000000 33.600000000 155.563 -33.840000000 33.960000000 164.814 -33.960000000 34.040000000 82.4069 -33.760000000 34.120000000 155.563 -34.400000000 34.600000000 164.814 -34.600000000 34.760000000 82.4069 -34.840000000 34.960000000 164.814 -34.400000000 35.080000000 155.563 -34.800000000 35.160000000 82.4069 -35.400000000 35.640000000 174.614 -35.520000000 35.680000000 82.4069 -35.400000000 35.760000000 155.563 -35.360000000 35.760000000 164.814 -36.080000000 36.280000000 164.814 -36.120000000 36.400000000 82.4069 -36.520000000 36.720000000 174.614 -36.640000000 36.720000000 1760 -36.520000000 36.760000000 82.4069 -36.640000000 36.760000000 164.814 -36.120000000 36.840000000 155.563 -37.160000000 37.240000000 554.365 -37.080000000 37.320000000 164.814 -37.240000000 37.360000000 82.4069 -37.120000000 37.400000000 155.563 -37.720000000 37.880000000 82.4069 -37.840000000 38.040000000 164.814 -37.720000000 38.400000000 155.563 -38.160000000 38.400000000 164.814 -38.720000000 38.840000000 82.4069 -38.760000000 38.880000000 87.3071 -38.640000000 39.000000000 164.814 -38.960000000 39.080000000 82.4069 -38.680000000 39.080000000 155.563 -39.440000000 39.560000000 82.4069 -39.400000000 39.640000000 164.814 -39.640000000 39.840000000 82.4069 -39.800000000 39.880000000 622.254 -39.800000000 40.000000000 87.3071 -39.400000000 40.040000000 155.563 -40.000000000 40.120000000 77.7817 -40.040000000 40.120000000 82.4069 -39.800000000 40.120000000 164.814 -40.400000000 40.480000000 82.4069 -40.480000000 40.560000000 174.614 +4.880000000 5.000000000 155.563 +5.520000000 5.640000000 164.814 +6.480000000 6.640000000 164.814 +6.580000000 6.700000000 155.563 +7.180000000 7.320000000 155.563 +8.140000000 8.260000000 155.563 +8.300000000 8.420000000 82.4069 +8.300000000 8.440000000 155.563 +8.840000000 9.000000000 164.814 +8.900000000 9.020000000 155.563 +9.520000000 9.640000000 82.4069 +9.520000000 9.640000000 155.563 +9.840000000 10.020000000 164.814 +9.960000000 10.120000000 155.563 +10.520000000 10.740000000 82.4069 +10.500000000 10.780000000 155.563 +11.140000000 11.260000000 155.563 +11.480000000 11.720000000 155.563 +12.140000000 12.280000000 164.814 +13.200000000 13.320000000 155.563 +13.700000000 13.820000000 82.4069 +13.700000000 13.960000000 155.563 +14.440000000 14.600000000 164.814 +14.860000000 15.040000000 155.563 +15.460000000 15.720000000 155.563 +17.160000000 17.300000000 155.563 +18.800000000 18.920000000 174.614 +18.820000000 18.940000000 155.563 +19.920000000 20.100000000 164.814 +20.560000000 20.700000000 164.814 +21.200000000 21.320000000 155.563 +21.220000000 21.360000000 164.814 +21.460000000 21.680000000 155.563 +21.540000000 21.720000000 164.814 +22.180000000 22.320000000 82.4069 +22.120000000 22.400000000 155.563 +22.860000000 22.980000000 164.814 +23.240000000 23.440000000 82.4069 +24.860000000 24.980000000 155.563 +24.900000000 25.040000000 164.814 +25.400000000 25.640000000 155.563 +26.080000000 26.220000000 164.814 +26.120000000 26.240000000 155.563 +26.540000000 26.660000000 155.563 +26.580000000 26.700000000 164.814 +28.260000000 28.400000000 164.814 +28.860000000 29.000000000 155.563 +29.500000000 29.620000000 164.814 +29.920000000 30.040000000 164.814 +30.480000000 30.620000000 164.814 +31.180000000 31.340000000 155.563 +32.120000000 32.280000000 164.814 +32.120000000 32.340000000 155.563 +32.840000000 32.980000000 155.563 +32.880000000 33.000000000 82.4069 +34.480000000 34.600000000 155.563 +34.500000000 34.620000000 164.814 +34.840000000 35.040000000 164.814 +35.400000000 35.560000000 82.4069 +35.520000000 35.640000000 155.563 +36.480000000 36.720000000 155.563 +37.800000000 37.920000000 164.814 +38.740000000 38.880000000 155.563 +38.860000000 38.980000000 164.814 +39.420000000 39.540000000 155.563 +39.440000000 39.560000000 164.814 +39.800000000 39.940000000 164.814 40.480000000 40.640000000 164.814 -40.400000000 40.760000000 155.563 -48.160000000 48.240000000 311.127
--- a/testdata/evaluation/run-piano.sh Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/evaluation/run-piano.sh Mon Jul 06 09:15:21 2015 +0100 @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash # Assumption: instrument parameter value 0 of the Silvet plugin is # always "multiple or unknown instruments" and 1 is always "piano". +set -eu + piano_path="/home/cannam/Music/piano_small_dataset" yc="/home/cannam/code/may/bin/yc" @@ -65,14 +67,14 @@ duration=30 - for instrument in $intended_instrument ; do + for instrument in $intended_instrument 0 ; do - for mode in 1 0; do + for mode in 2 1 0; do for norm in no; do echo - echo "For file $filename, instrument $instrument, norm $norm..." + echo "For mode $mode, file $filename, instrument $instrument, norm $norm..." if [ "$norm" = "no" ]; then # Don't normalise; plugin is now supposed to do it @@ -105,15 +107,15 @@ mark="" if [ "$ms" = "50" ]; then if [ "$instrument" = "0" ]; then - mark=" <-- main generic preset for $filename (norm = $norm)"; + mark=" <-- main generic preset for $filename (mode = $mode, norm = $norm)"; else - mark=" <-- main piano preset for $filename (norm = $norm)"; + mark=" <-- main piano preset for $filename (mode = $mode, norm = $norm)"; fi fi; echo echo "Validating against ground truth at $ms ms:" egrep '(^[0-9]\.)|(^[012][0-9]\.)' "../piano-groundtruth/$filename.lab" > "$reference.lab" - "$yc" ../scripts/evaluate_lab.yeti "$ms" "$reference.lab" "$outfile.lab" | sed 's,$,'"$mark"',' + "$yc" ../scripts/evaluate_lab.yeti "$ms" "$reference.lab" "$outfile.lab" | sed 's#$#'"$mark"'#' done; echo done
--- a/testdata/evaluation/run.sh Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/evaluation/run.sh Mon Jul 06 09:15:21 2015 +0100 @@ -79,6 +79,8 @@ piece=`basename \`dirname "$infile" \`` arrangement=`basename "$infile" .wav` + + # Change this to the processing mode you want to test (e.g. 0 for draft) mode=1 echo @@ -96,7 +98,7 @@ --csv-one-file "$outfile" \ --csv-force \ --transform "$transfile" \ - "$tmpwav" + "$tmpwav" 2>/dev/null cat "$outfile" | \ sed 's/^[^,]*,//' | \
--- a/testdata/timing/run.sh Tue Apr 28 11:09:31 2015 +0100 +++ b/testdata/timing/run.sh Mon Jul 06 09:15:21 2015 +0100 @@ -20,6 +20,8 @@ VAMP_PATH=../.. export VAMP_PATH +tfile=transform.ttl + outfile="/tmp/$$" tmpwav="/tmp/$$norm.wav" @@ -32,7 +34,7 @@ --writer csv \ --csv-one-file "$outfile" \ --csv-force \ - --default vamp:silvet:silvet:notes \ + --transform "$tfile" \ "$tmpwav" cat "$outfile" | \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testdata/timing/transform.ttl Mon Jul 06 09:15:21 2015 +0100 @@ -0,0 +1,22 @@ +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . +@prefix vamp: <http://purl.org/ontology/vamp/> . +@prefix : <#> . + +:transform a vamp:Transform ; + vamp:plugin <http://vamp-plugins.org/rdf/plugins/silvet#silvet> ; + vamp:step_size "1024"^^xsd:int ; + vamp:block_size "1024"^^xsd:int ; + vamp:plugin_version """3""" ; + vamp:parameter_binding [ + vamp:parameter [ vamp:identifier "finetune" ] ; + vamp:value "0"^^xsd:float ; + ] ; + vamp:parameter_binding [ + vamp:parameter [ vamp:identifier "instrument" ] ; + vamp:value "0"^^xsd:float ; # general + ] ; + vamp:parameter_binding [ + vamp:parameter [ vamp:identifier "mode" ] ; + vamp:value "1"^^xsd:float ; # hq + ] ; + vamp:output <http://vamp-plugins.org/rdf/plugins/silvet#silvet_output_notes> .