Mercurial > hg > sonic-annotator
changeset 177:795d67a5e266
Change internal blocksize from 16384 to 1024 (see comment in FeatureExtractionManager ctor)
line wrap: on
line diff
--- a/configure Wed Oct 15 17:02:48 2014 +0100 +++ b/configure Thu Oct 16 10:32:16 2014 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Sonic Annotator 1.1-hg. +# Generated by GNU Autoconf 2.69 for Sonic Annotator 1.1. # # Report bugs to <cannam@all-day-breakfast.com>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Sonic Annotator' PACKAGE_TARNAME='sonic-annotator' -PACKAGE_VERSION='1.1-hg' -PACKAGE_STRING='Sonic Annotator 1.1-hg' +PACKAGE_VERSION='1.1' +PACKAGE_STRING='Sonic Annotator 1.1' PACKAGE_BUGREPORT='cannam@all-day-breakfast.com' PACKAGE_URL='' @@ -1313,7 +1313,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Sonic Annotator 1.1-hg to adapt to many kinds of systems. +\`configure' configures Sonic Annotator 1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1374,7 +1374,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Sonic Annotator 1.1-hg:";; + short | recursive ) echo "Configuration of Sonic Annotator 1.1:";; esac cat <<\_ACEOF @@ -1509,7 +1509,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Sonic Annotator configure 1.1-hg +Sonic Annotator configure 1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1849,7 +1849,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Sonic Annotator $as_me 1.1-hg, which was +It was created by Sonic Annotator $as_me 1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7092,7 +7092,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Sonic Annotator $as_me 1.1-hg, which was +This file was extended by Sonic Annotator $as_me 1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7145,7 +7145,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Sonic Annotator config.status 1.1-hg +Sonic Annotator config.status 1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
--- a/configure.ac Wed Oct 15 17:02:48 2014 +0100 +++ b/configure.ac Thu Oct 16 10:32:16 2014 +0100 @@ -1,5 +1,5 @@ -AC_INIT([Sonic Annotator], [1.1-hg], cannam@all-day-breakfast.com) +AC_INIT([Sonic Annotator], [1.1], cannam@all-day-breakfast.com) AC_CONFIG_SRCDIR(runner/main.cpp)
--- a/runner/FeatureExtractionManager.cpp Wed Oct 15 17:02:48 2014 +0100 +++ b/runner/FeatureExtractionManager.cpp Thu Oct 16 10:32:16 2014 +0100 @@ -54,9 +54,16 @@ FeatureExtractionManager::FeatureExtractionManager() : m_summariesOnly(false), // We can read using an arbitrary fixed block size -- - // PluginBufferingAdapter handles this for us. It's likely to be - // quicker to use larger sizes than smallish ones like 1024 - m_blockSize(16384), + // PluginBufferingAdapter handles this for us. But while this + // doesn't affect the step and block size actually passed to the + // plugin, it does affect the overall time range of the audio + // input (which gets rounded to the nearest block boundary). So + // although a larger blocksize will normally run faster, and we + // used a blocksize of 16384 in earlier releases of Sonic + // Annotator for that reason, a smaller blocksize produces + // "better" results and this is particularly relevant now we + // support the start and duration flags for a transform. + m_blockSize(1024), m_defaultSampleRate(0), m_sampleRate(0), m_channels(0),
--- a/tests/test-multiple-audio/expected/all-files.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-multiple-audio/expected/all-files.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,28 +1,28 @@ -"./../audio/20sec-silence.wav",0.000000000,20.062040815,mean,61.6562,"(mean value, continuous-time average)" -,0.000000000,20.062040815,median,0,"(median value, continuous-time average)" -,0.000000000,20.062040815,mode,0,"(modal value, continuous-time average)" -,0.000000000,20.062040815,mean,895.898,"(mean value, continuous-time average)" -"./../audio/3clicks.mp3",0.000000000,5.201269840,mean,164.674,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,169,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,680.411,"(mean value, continuous-time average)" -"./../audio/3clicks.ogg",0.000000000,5.201269840,mean,162.694,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,169,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,174,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,697.732,"(mean value, continuous-time average)" -"./../audio/3clicks8.wav",0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,168,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,677.241,"(mean value, continuous-time average)" -"./../audio/3clicks8quiet.wav",0.000000000,5.201269840,mean,162.266,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,169,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,648.857,"(mean value, continuous-time average)" -"./../audio/6clicks.ogg",0.000000000,10.031020407,mean,166.612,"(mean value, continuous-time average)" -,0.000000000,10.031020407,median,167,"(median value, continuous-time average)" -,0.000000000,10.031020407,mode,170,"(modal value, continuous-time average)" -,0.000000000,10.031020407,mean,713.148,"(mean value, continuous-time average)" -"./../audio/6clicks8.wav",0.000000000,10.031020407,mean,169.079,"(mean value, continuous-time average)" -,0.000000000,10.031020407,median,169,"(median value, continuous-time average)" -,0.000000000,10.031020407,mode,164,"(modal value, continuous-time average)" -,0.000000000,10.031020407,mean,695.759,"(mean value, continuous-time average)" +"./../audio/20sec-silence.wav",0.000000000,20.015600906,mean,61.7993,"(mean value, continuous-time average)" +,0.000000000,20.015600906,median,0,"(median value, continuous-time average)" +,0.000000000,20.015600906,mode,0,"(modal value, continuous-time average)" +,0.000000000,20.015600906,mean,893.23,"(mean value, continuous-time average)" +"./../audio/3clicks.mp3",0.000000000,5.061950112,mean,169.206,"(mean value, continuous-time average)" +,0.000000000,5.061950112,median,170,"(median value, continuous-time average)" +,0.000000000,5.061950112,mode,162,"(modal value, continuous-time average)" +,0.000000000,5.061950112,mean,699.101,"(mean value, continuous-time average)" +"./../audio/3clicks.ogg",0.000000000,4.992290248,mean,169.505,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,170,"(median value, continuous-time average)" +,0.000000000,4.992290248,mode,174,"(modal value, continuous-time average)" +,0.000000000,4.992290248,mean,724.777,"(mean value, continuous-time average)" +"./../audio/3clicks8.wav",0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,169,"(median value, continuous-time average)" +,0.000000000,4.992290248,mode,164,"(modal value, continuous-time average)" +,0.000000000,4.992290248,mean,703.191,"(mean value, continuous-time average)" +"./../audio/3clicks8quiet.wav",0.000000000,4.992290248,mean,169.058,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,169,"(median value, continuous-time average)" +,0.000000000,4.992290248,mode,165,"(modal value, continuous-time average)" +,0.000000000,4.992290248,mean,673.623,"(mean value, continuous-time average)" +"./../audio/6clicks.ogg",0.000000000,9.961360543,mean,167.58,"(mean value, continuous-time average)" +,0.000000000,9.961360543,median,167,"(median value, continuous-time average)" +,0.000000000,9.961360543,mode,170,"(modal value, continuous-time average)" +,0.000000000,9.961360543,mean,714.928,"(mean value, continuous-time average)" +"./../audio/6clicks8.wav",0.000000000,9.961360543,mean,170.174,"(mean value, continuous-time average)" +,0.000000000,9.961360543,median,169,"(median value, continuous-time average)" +,0.000000000,9.961360543,mode,164,"(modal value, continuous-time average)" +,0.000000000,9.961360543,mean,698.921,"(mean value, continuous-time average)"
--- a/tests/test-multiple-audio/expected/playlist.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-multiple-audio/expected/playlist.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,8 +1,8 @@ -"3clicks.mp3",0.000000000,5.201269840,mean,164.674,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,169,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,680.411,"(mean value, continuous-time average)" -"6clicks.ogg",0.000000000,10.031020407,mean,166.612,"(mean value, continuous-time average)" -,0.000000000,10.031020407,median,167,"(median value, continuous-time average)" -,0.000000000,10.031020407,mode,170,"(modal value, continuous-time average)" -,0.000000000,10.031020407,mean,713.148,"(mean value, continuous-time average)" +"3clicks.mp3",0.000000000,5.061950112,mean,169.206,"(mean value, continuous-time average)" +,0.000000000,5.061950112,median,170,"(median value, continuous-time average)" +,0.000000000,5.061950112,mode,162,"(modal value, continuous-time average)" +,0.000000000,5.061950112,mean,699.101,"(mean value, continuous-time average)" +"6clicks.ogg",0.000000000,9.961360543,mean,167.58,"(mean value, continuous-time average)" +,0.000000000,9.961360543,median,167,"(median value, continuous-time average)" +,0.000000000,9.961360543,mode,170,"(modal value, continuous-time average)" +,0.000000000,9.961360543,mean,714.928,"(mean value, continuous-time average)"
--- a/tests/test-summaries/expected/summaries-all-summaries-only.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-all-summaries-only.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,9 +1,9 @@ -"./../audio/3clicks8.wav",0.000000000,5.201269840,count,448,"(count)" -,0.000000000,5.201269840,max,503,"(maximum value)" -,0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,168,"(median value, continuous-time average)" -,0.000000000,5.201269840,min,0,"(minimum value)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,sd,46.2356,"(standard deviation, continuous-time average)" -,0.000000000,5.201269840,sum,72838,"(sum)" -,0.000000000,5.201269840,variance,2137.73,"(variance, continuous-time average)" +"./../audio/3clicks8.wav",0.000000000,4.992290248,count,430,"(count)" +,0.000000000,4.992290248,max,503,"(maximum value)" +,0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,169,"(median value, continuous-time average)" +,0.000000000,4.992290248,min,0,"(minimum value)" +,0.000000000,4.992290248,mode,164,"(modal value, continuous-time average)" +,0.000000000,4.992290248,sd,32.7775,"(standard deviation, continuous-time average)" +,0.000000000,4.992290248,sum,72838,"(sum)" +,0.000000000,4.992290248,variance,1074.36,"(variance, continuous-time average)"
--- a/tests/test-summaries/expected/summaries-from-rdf-summaries-only.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-from-rdf-summaries-only.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,4 +1,4 @@ -"./../audio/3clicks8.wav",0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,168,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,677.241,"(mean value, continuous-time average)" +"./../audio/3clicks8.wav",0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,169,"(median value, continuous-time average)" +,0.000000000,4.992290248,mode,164,"(modal value, continuous-time average)" +,0.000000000,4.992290248,mean,703.191,"(mean value, continuous-time average)"
--- a/tests/test-summaries/expected/summaries-from-rdf.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-from-rdf.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,7 +1,7 @@ "./../audio/3clicks8.wav",0.777868481 ,1.648616780 ,2.414875283 -,0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)" -,0.000000000,5.201269840,median,168,"(median value, continuous-time average)" -,0.000000000,5.201269840,mode,0,"(modal value, continuous-time average)" -,0.000000000,5.201269840,mean,677.241,"(mean value, continuous-time average)" +,0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)" +,0.000000000,4.992290248,median,169,"(median value, continuous-time average)" +,0.000000000,4.992290248,mode,164,"(modal value, continuous-time average)" +,0.000000000,4.992290248,mean,703.191,"(mean value, continuous-time average)"
--- a/tests/test-summaries/expected/summaries-from-rdf.n3 Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-from-rdf.n3 Thu Oct 16 10:32:16 2014 +0100 @@ -77,11 +77,11 @@ :event_7 event:time [ tl:beginsAt "PT0.000000000S"^^xsd:duration ; - tl:duration "PT5.201269840S"^^xsd:duration ; + tl:duration "PT4.992290248S"^^xsd:duration ; tl:onTimeLine :signal_timeline_1 ; a tl:Interval ] ; - af:feature "677.241" ; + af:feature "703.191" ; vamp:computed_by :transform_5_detectionfunction ; a :event_type_6 ; rdfs:label "(mean value, continuous-time average)" . @@ -104,11 +104,11 @@ :event_10 event:time [ tl:beginsAt "PT0.000000000S"^^xsd:duration ; - tl:duration "PT5.201269840S"^^xsd:duration ; + tl:duration "PT4.992290248S"^^xsd:duration ; tl:onTimeLine :signal_timeline_1 ; a tl:Interval ] ; - af:feature "162.585" ; + af:feature "169.391" ; vamp:computed_by :transform_8_detectionfunction ; a :event_type_9 ; rdfs:label "(mean value, continuous-time average)" . @@ -131,11 +131,11 @@ :event_13 event:time [ tl:beginsAt "PT0.000000000S"^^xsd:duration ; - tl:duration "PT5.201269840S"^^xsd:duration ; + tl:duration "PT4.992290248S"^^xsd:duration ; tl:onTimeLine :signal_timeline_1 ; a tl:Interval ] ; - af:feature "168" ; + af:feature "169" ; vamp:computed_by :transform_11_detectionfunction ; a :event_type_12 ; rdfs:label "(median value, continuous-time average)" . @@ -158,11 +158,11 @@ :event_16 event:time [ tl:beginsAt "PT0.000000000S"^^xsd:duration ; - tl:duration "PT5.201269840S"^^xsd:duration ; + tl:duration "PT4.992290248S"^^xsd:duration ; tl:onTimeLine :signal_timeline_1 ; a tl:Interval ] ; - af:feature "0" ; + af:feature "164" ; vamp:computed_by :transform_14_detectionfunction ; a :event_type_15 ; rdfs:label "(modal value, continuous-time average)" .
--- a/tests/test-summaries/expected/summaries-segments.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-segments.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,2 +1,2 @@ "./../audio/6clicks8.wav",0.000000000,9.900000000,median,169,"(median value, continuous-time average)" -,9.900000000,0.131020407,median,75,"(median value, continuous-time average)" +,9.900000000,0.061360543,median,179,"(median value, continuous-time average)"
--- a/tests/test-summaries/expected/summaries-with-mean.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries-with-mean.csv Thu Oct 16 10:32:16 2014 +0100 @@ -428,22 +428,4 @@ ,4.957460317,176 ,4.969070294,171 ,4.980680272,93 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0 -,0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)" +,0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)"
--- a/tests/test-summaries/expected/summaries.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-summaries/expected/summaries.csv Thu Oct 16 10:32:16 2014 +0100 @@ -428,21 +428,3 @@ ,4.957460317,176 ,4.969070294,171 ,4.980680272,93 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0
--- a/tests/test-transforms-basic/expected/multiple.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/multiple.csv Thu Oct 16 10:32:16 2014 +0100 @@ -4,10 +4,10 @@ ,0.394739229 ,0.777868481 ,0.782312925 +,1.650680272 ,1.648616780 -,1.650680272 +,2.417346939 ,2.414875283 -,2.417346939 ,2.414875283 ,3.041814059 ,3.134693877
--- a/tests/test-transforms-basic/expected/percussiononsets-df-start-and-duration.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-df-start-and-duration.csv Thu Oct 16 10:32:16 2014 +0100 @@ -172,21 +172,3 @@ ,3.985306122,144 ,3.996916099,173 ,4.008526077,174 -,4.020136054,167 -,4.031746031,159 -,4.043356009,164 -,4.054965986,162 -,4.066575963,178 -,4.078185941,187 -,4.089795918,145 -,4.101405895,159 -,4.113015873,162 -,4.124625850,181 -,4.136235827,167 -,4.147845804,158 -,4.159455782,173 -,4.171065759,169 -,4.182675736,158 -,4.194285714,194 -,4.205895691,157 -,4.217505668,166
--- a/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-default.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-default.csv Thu Oct 16 10:32:16 2014 +0100 @@ -428,21 +428,3 @@ ,4.957460317,176 ,4.969070294,171 ,4.980680272,93 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0
--- a/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-hamming.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-hamming.csv Thu Oct 16 10:32:16 2014 +0100 @@ -428,21 +428,3 @@ ,4.957460317,177 ,4.969070294,170 ,4.980680272,90 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0
--- a/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-hanning.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-df-windowtype-hanning.csv Thu Oct 16 10:32:16 2014 +0100 @@ -428,21 +428,3 @@ ,4.957460317,176 ,4.969070294,171 ,4.980680272,93 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0
--- a/tests/test-transforms-basic/expected/percussiononsets-multiple-outputs-start-and-duration.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-multiple-outputs-start-and-duration.csv Thu Oct 16 10:32:16 2014 +0100 @@ -1,28 +1,6 @@ "./../audio/3clicks8.wav",1.650158730 -,1.743038548,0 -,1.754648526,255 -,1.766258503,181 -,1.777868480,173 -,1.789478458,164 -,1.801088435,143 -,1.812698412,187 -,1.824308390,191 -,1.835918367,184 -,1.847528344,169 -,1.859138321,156 -,1.870748299,178 -,1.882358276,162 -,1.893968253,172 -,1.905578231,166 -,1.917188208,150 -,1.928798185,178 -,1.940408163,166 -,1.952018140,177 -,1.963628117,154 -,1.975238095,155 -,1.986848072,158 -,1.998458049,191 -,2.010068027,167 +,1.998458049,0 +,2.010068027,230 ,2.021678004,192 ,2.033287981,164 ,2.044897959,192 @@ -30,7 +8,6 @@ ,2.068117913,179 ,2.079727891,162 ,2.091337868,168 -,2.416417233 ,2.102947845,177 ,2.114557823,179 ,2.126167800,169 @@ -59,6 +36,7 @@ ,2.393197278,171 ,2.404807256,288 ,2.416417233,438 +,2.416417233 ,2.428027210,29 ,2.439637188,161 ,2.451247165,166 @@ -196,31 +174,3 @@ ,3.983764172,159 ,3.995374149,180 ,4.006984126,163 -,4.018594104,182 -,4.030204081,148 -,4.041814058,183 -,4.053424036,159 -,4.065034013,181 -,4.076643990,184 -,4.088253968,143 -,4.099863945,154 -,4.111473922,165 -,4.123083900,175 -,4.134693877,176 -,4.146303854,158 -,4.157913832,189 -,4.169523809,157 -,4.181133786,163 -,4.192743764,196 -,4.204353741,160 -,4.215963718,168 -,4.227573696,184 -,4.239183673,155 -,4.250793650,168 -,4.262403628,169 -,4.274013605,191 -,4.285623582,155 -,4.297233560,169 -,4.308843537,161 -,4.320453514,172 -,4.332063492,181
--- a/tests/test-transforms-basic/expected/percussiononsets-multiple-outputs.csv Wed Oct 15 17:02:48 2014 +0100 +++ b/tests/test-transforms-basic/expected/percussiononsets-multiple-outputs.csv Thu Oct 16 10:32:16 2014 +0100 @@ -67,6 +67,7 @@ ,0.766258503,173 ,0.777868480,449 ,0.789478458,30 +,0.777868481 ,0.801088435,70 ,0.812698412,181 ,0.824308390,165 @@ -93,7 +94,6 @@ ,1.068117913,162 ,1.079727891,170 ,1.091337868,186 -,0.777868481 ,1.102947845,178 ,1.114557823,178 ,1.126167800,155 @@ -144,6 +144,7 @@ ,1.648616780,503 ,1.660226757,0 ,1.671836734,30 +,1.648616780 ,1.683446712,189 ,1.695056689,146 ,1.706666666,174 @@ -158,7 +159,6 @@ ,1.811156462,193 ,1.822766439,187 ,1.834376417,176 -,1.648616780 ,1.845986394,172 ,1.857596371,155 ,1.869206349,185 @@ -211,6 +211,7 @@ ,2.414875283,444 ,2.426485260,27 ,2.438095238,150 +,2.414875283 ,2.449705215,166 ,2.461315192,177 ,2.472925170,174 @@ -223,7 +224,6 @@ ,2.554195011,168 ,2.565804988,165 ,2.577414965,168 -,2.414875283 ,2.589024943,149 ,2.600634920,171 ,2.612244897,164 @@ -431,21 +431,3 @@ ,4.957460317,176 ,4.969070294,171 ,4.980680272,93 -,4.992290249,0 -,5.003900226,0 -,5.015510204,0 -,5.027120181,0 -,5.038730158,0 -,5.050340136,0 -,5.061950113,0 -,5.073560090,0 -,5.085170068,0 -,5.096780045,0 -,5.108390022,0 -,5.120000000,0 -,5.131609977,0 -,5.143219954,0 -,5.154829931,0 -,5.166439909,0 -,5.178049886,0 -,5.189659863,0