Mercurial > hg > sonic-annotator

changeset 28:102bb1729184 sonic-annotator-0.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Test fixes for cases where the behaviour has actually been fixed for 0.4 * Emphasise this change in CHANGELOG
author Chris Cannam
date Fri, 25 Sep 2009 12:00:58 +0000
parents 9fef62a3696d
children f7a1b84c447c
files CHANGELOG runner/main.cpp tests/expected/transforms-basic-percussiononsets-set-parameters.csv tests/expected/transforms-basic-percussiononsets-set-step-and-block-size.csv tests/expected/transforms-summaries-percussiononsets-all-summaries-only.csv tests/expected/transforms-summaries-percussiononsets-from-rdf.csv tests/expected/transforms-summaries-percussiononsets-from-rdf.n3 tests/expected/transforms-summaries-percussiononsets-with-mean.csv tests/expected/transforms-summaries-percussiononsets.csv tests/test-audioformat.sh tests/test-summaries.sh tests/test-transforms-basic.sh
diffstat 12 files changed, 901 insertions(+), 896 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Thu Sep 24 14:34:00 2009 +0000
+++ b/CHANGELOG	Fri Sep 25 12:00:58 2009 +0000
@@ -7,12 +7,16 @@
 
 Front-end changes:
 
+ - Frequency-domain plugins now use the PluginInputDomainAdapter's new
+ ShiftData processing method, ensuring that the first block received
+ by the plugin is the one centred on 0 rather than starting at 0.
+ Unfortunately, the old behaviour omitted a timing compensation step,
+ and this fix actually changes the results from some plugin processes:
+ the previous behaviour was not always in line with the Vamp plugin
+ specification.
+
  - More useful diagnostics are now available when a plugin fails to
- load or run
- - Frequency-domain plugins now use the PluginInputDomainAdapter's
- new ShiftData processing method, ensuring that the first block
- received by the plugin is the one centred on 0 rather than starting
- at 0: we think this is a better match for normal usage expectations.
+ load or run.
 
 CSV back-end (feature writer) changes:
 
--- a/runner/main.cpp	Thu Sep 24 14:34:00 2009 +0000
+++ b/runner/main.cpp	Fri Sep 25 12:00:58 2009 +0000
@@ -720,6 +720,8 @@
         }
     }
 
+    bool good = true;
+
     for (QStringList::const_iterator i = sources.begin();
          i != sources.end(); ++i) {
         std::cerr << "Extracting features for: \"" << i->toStdString() << "\"" << std::endl;
@@ -737,6 +739,7 @@
                     cerr << "NOTE: \"--force\" option was provided, continuing (more errors may occur)" << endl;
                 }
             } else {
+                good = false;
                 break;
             }
         }
@@ -756,7 +759,8 @@
 
     TempDirectory::getInstance()->cleanup();
     
-    return 0;
+    if (good) return 0;
+    else return 1;
 }
 
 
--- a/tests/expected/transforms-basic-percussiononsets-set-parameters.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-basic-percussiononsets-set-parameters.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -1,13 +1,14 @@
-"./audio/3clicks8.wav",0.162539682
+"./audio/3clicks8.wav",0.011609977
+,0.162539682
 ,0.290249433
 ,0.394739229
-,0.777868480
+,0.777868481
 ,1.648616780
 ,2.414875283
-,3.041814058
+,3.041814059
 ,3.134693877
 ,3.157913832
 ,3.599092970
 ,3.831292517
-,4.504671201
+,4.504671202
 ,4.748480725
--- a/tests/expected/transforms-basic-percussiononsets-set-step-and-block-size.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-basic-percussiononsets-set-step-and-block-size.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -1,3 +1,3 @@
-"./audio/3clicks8.wav",0.780294784
-,1.648662131
-,2.415328797
+"./audio/3clicks8.wav",0.782312925
+,1.650680272
+,2.417346939
--- a/tests/expected/transforms-summaries-percussiononsets-all-summaries-only.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-summaries-percussiononsets-all-summaries-only.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -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.123,"(mean value, continuous-time average)"
+,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.82,"(standard deviation, continuous-time average)"
-,0.000000000,5.201269840,sum,72631,"(sum)"
-,0.000000000,5.201269840,variance,2192.12,"(variance, 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)"
--- a/tests/expected/transforms-summaries-percussiononsets-from-rdf.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-summaries-percussiononsets-from-rdf.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -1,7 +1,7 @@
-"./audio/3clicks8.wav",0.777868480
+"./audio/3clicks8.wav",0.777868481
 ,1.648616780
 ,2.414875283
-,0.000000000,5.201269840,mean,668.509,"(mean value, continuous-time average)"
-,0.000000000,5.201269840,mean,162.123,"(mean value, continuous-time average)"
+,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)"
--- a/tests/expected/transforms-summaries-percussiononsets-from-rdf.n3	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-summaries-percussiononsets-from-rdf.n3	Fri Sep 25 12:00:58 2009 +0000
@@ -32,7 +32,7 @@
 
 :event_2
     event:time [
-        tl:at "PT0.777868480S"^^xsd:duration ;
+        tl:at "PT0.777868481S"^^xsd:duration ;
         tl:onTimeLine :signal_timeline_1 ;
         a tl:Instant
     ] ;
@@ -58,11 +58,11 @@
     a af:Onset .
 
 :transform_5_detectionfunction
-    vamp:block_size "1024"^^xsd:int ;
+    vamp:block_size "4096"^^xsd:int ;
     vamp:output <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets_output_detectionfunction> ;
     vamp:plugin <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets> ;
     vamp:sample_rate "44100"^^xsd:float ;
-    vamp:step_size "512"^^xsd:int ;
+    vamp:step_size "2048"^^xsd:int ;
     vamp:summary_type "mean" ;
     a vamp:Transform .
 
@@ -79,7 +79,7 @@
         tl:onTimeLine :signal_timeline_1 ;
         a tl:Interval
     ] ;
-    af:feature "162.123" ;
+    af:feature "677.241" ;
     vamp:computed_by :transform_5_detectionfunction ;
     a :event_type_6 ;
     rdfs:label "(mean value, continuous-time average)" .
@@ -90,7 +90,7 @@
     vamp:plugin <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets> ;
     vamp:sample_rate "44100"^^xsd:float ;
     vamp:step_size "512"^^xsd:int ;
-    vamp:summary_type "median" ;
+    vamp:summary_type "mean" ;
     a vamp:Transform .
 
 :event_type_9
@@ -106,10 +106,10 @@
         tl:onTimeLine :signal_timeline_1 ;
         a tl:Interval
     ] ;
-    af:feature "168" ;
+    af:feature "162.585" ;
     vamp:computed_by :transform_8_detectionfunction ;
     a :event_type_9 ;
-    rdfs:label "(median value, continuous-time average)" .
+    rdfs:label "(mean value, continuous-time average)" .
 
 :transform_11_detectionfunction
     vamp:block_size "1024"^^xsd:int ;
@@ -117,7 +117,7 @@
     vamp:plugin <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets> ;
     vamp:sample_rate "44100"^^xsd:float ;
     vamp:step_size "512"^^xsd:int ;
-    vamp:summary_type "mode" ;
+    vamp:summary_type "median" ;
     a vamp:Transform .
 
 :event_type_12
@@ -133,18 +133,18 @@
         tl:onTimeLine :signal_timeline_1 ;
         a tl:Interval
     ] ;
-    af:feature "0" ;
+    af:feature "168" ;
     vamp:computed_by :transform_11_detectionfunction ;
     a :event_type_12 ;
-    rdfs:label "(modal value, continuous-time average)" .
+    rdfs:label "(median value, continuous-time average)" .
 
 :transform_14_detectionfunction
-    vamp:block_size "4096"^^xsd:int ;
+    vamp:block_size "1024"^^xsd:int ;
     vamp:output <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets_output_detectionfunction> ;
     vamp:plugin <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#percussiononsets> ;
     vamp:sample_rate "44100"^^xsd:float ;
-    vamp:step_size "2048"^^xsd:int ;
-    vamp:summary_type "mean" ;
+    vamp:step_size "512"^^xsd:int ;
+    vamp:summary_type "mode" ;
     a vamp:Transform .
 
 :event_type_15
@@ -160,8 +160,8 @@
         tl:onTimeLine :signal_timeline_1 ;
         a tl:Interval
     ] ;
-    af:feature "668.509" ;
+    af:feature "0" ;
     vamp:computed_by :transform_14_detectionfunction ;
     a :event_type_15 ;
-    rdfs:label "(mean value, continuous-time average)" .
+    rdfs:label "(modal value, continuous-time average)" .
 
--- a/tests/expected/transforms-summaries-percussiononsets-with-mean.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-summaries-percussiononsets-with-mean.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -1,433 +1,433 @@
 "./audio/3clicks8.wav",0.000000000,0
-,0.011609977,170
-,0.023219954,184
-,0.034829931,166
-,0.046439909,174
-,0.058049886,179
-,0.069659863,162
-,0.081269841,157
-,0.092879818,156
-,0.104489795,182
-,0.116099773,168
+,0.011609977,207
+,0.023219954,170
+,0.034829931,184
+,0.046439909,166
+,0.058049886,174
+,0.069659863,179
+,0.081269841,162
+,0.092879818,157
+,0.104489795,156
+,0.116099773,182
 ,0.127709750,168
-,0.139319727,155
-,0.150929705,200
-,0.162539682,163
-,0.174149659,178
-,0.185759637,164
-,0.197369614,166
-,0.208979591,137
-,0.220589569,155
-,0.232199546,177
-,0.243809523,145
-,0.255419501,172
-,0.267029478,155
-,0.278639455,201
-,0.290249433,166
-,0.301859410,169
-,0.313469387,158
-,0.325079365,169
-,0.336689342,155
-,0.348299319,187
-,0.359909297,177
-,0.371519274,149
-,0.383129251,196
-,0.394739229,160
-,0.406349206,174
-,0.417959183,165
-,0.429569160,149
-,0.441179138,181
-,0.452789115,180
-,0.464399092,156
-,0.476009070,163
-,0.487619047,188
-,0.499229024,173
-,0.510839002,160
-,0.522448979,168
-,0.534058956,154
-,0.545668934,155
-,0.557278911,161
-,0.568888888,163
-,0.580498866,172
-,0.592108843,168
-,0.603718820,181
-,0.615328798,167
-,0.626938775,172
-,0.638548752,158
-,0.650158730,172
-,0.661768707,167
-,0.673378684,180
-,0.684988662,188
-,0.696598639,160
-,0.708208616,166
-,0.719818594,158
-,0.731428571,176
-,0.743038548,153
-,0.754648526,173
-,0.766258503,449
-,0.777868480,30
-,0.789478458,70
-,0.801088435,181
-,0.812698412,165
-,0.824308390,174
-,0.835918367,181
-,0.847528344,179
-,0.859138321,154
-,0.870748299,169
-,0.882358276,150
-,0.893968253,189
-,0.905578231,159
-,0.917188208,172
-,0.928798185,157
-,0.940408163,167
-,0.952018140,169
-,0.963628117,155
-,0.975238095,189
-,0.986848072,178
-,0.998458049,168
-,1.010068027,169
-,1.021678004,178
-,1.033287981,157
-,1.044897959,166
-,1.056507936,162
-,1.068117913,170
-,1.079727891,186
-,1.091337868,178
+,0.139319727,168
+,0.150929705,155
+,0.162539682,200
+,0.174149659,163
+,0.185759637,178
+,0.197369614,164
+,0.208979591,166
+,0.220589569,137
+,0.232199546,155
+,0.243809523,177
+,0.255419501,145
+,0.267029478,172
+,0.278639455,155
+,0.290249433,201
+,0.301859410,166
+,0.313469387,169
+,0.325079365,158
+,0.336689342,169
+,0.348299319,155
+,0.359909297,187
+,0.371519274,177
+,0.383129251,149
+,0.394739229,196
+,0.406349206,160
+,0.417959183,174
+,0.429569160,165
+,0.441179138,149
+,0.452789115,181
+,0.464399092,180
+,0.476009070,156
+,0.487619047,163
+,0.499229024,188
+,0.510839002,173
+,0.522448979,160
+,0.534058956,168
+,0.545668934,154
+,0.557278911,155
+,0.568888888,161
+,0.580498866,163
+,0.592108843,172
+,0.603718820,168
+,0.615328798,181
+,0.626938775,167
+,0.638548752,172
+,0.650158730,158
+,0.661768707,172
+,0.673378684,167
+,0.684988662,180
+,0.696598639,188
+,0.708208616,160
+,0.719818594,166
+,0.731428571,158
+,0.743038548,176
+,0.754648526,153
+,0.766258503,173
+,0.777868480,449
+,0.789478458,30
+,0.801088435,70
+,0.812698412,181
+,0.824308390,165
+,0.835918367,174
+,0.847528344,181
+,0.859138321,179
+,0.870748299,154
+,0.882358276,169
+,0.893968253,150
+,0.905578231,189
+,0.917188208,159
+,0.928798185,172
+,0.940408163,157
+,0.952018140,167
+,0.963628117,169
+,0.975238095,155
+,0.986848072,189
+,0.998458049,178
+,1.010068027,168
+,1.021678004,169
+,1.033287981,178
+,1.044897959,157
+,1.056507936,166
+,1.068117913,162
+,1.079727891,170
+,1.091337868,186
 ,1.102947845,178
-,1.114557823,155
-,1.126167800,173
-,1.137777777,156
-,1.149387755,158
-,1.160997732,170
-,1.172607709,167
-,1.184217687,160
-,1.195827664,180
-,1.207437641,153
-,1.219047619,154
-,1.230657596,171
-,1.242267573,159
-,1.253877551,194
-,1.265487528,170
-,1.277097505,157
-,1.288707482,184
-,1.300317460,156
-,1.311927437,173
-,1.323537414,184
-,1.335147392,168
-,1.346757369,182
-,1.358367346,147
-,1.369977324,164
-,1.381587301,163
-,1.393197278,165
-,1.404807256,181
-,1.416417233,172
-,1.428027210,169
-,1.439637188,165
-,1.451247165,166
-,1.462857142,158
-,1.474467120,162
-,1.486077097,188
-,1.497687074,176
+,1.114557823,178
+,1.126167800,155
+,1.137777777,173
+,1.149387755,156
+,1.160997732,158
+,1.172607709,170
+,1.184217687,167
+,1.195827664,160
+,1.207437641,180
+,1.219047619,153
+,1.230657596,154
+,1.242267573,171
+,1.253877551,159
+,1.265487528,194
+,1.277097505,170
+,1.288707482,157
+,1.300317460,184
+,1.311927437,156
+,1.323537414,173
+,1.335147392,184
+,1.346757369,168
+,1.358367346,182
+,1.369977324,147
+,1.381587301,164
+,1.393197278,163
+,1.404807256,165
+,1.416417233,181
+,1.428027210,172
+,1.439637188,169
+,1.451247165,165
+,1.462857142,166
+,1.474467120,158
+,1.486077097,162
+,1.497687074,188
 ,1.509297052,176
-,1.520907029,159
-,1.532517006,183
-,1.544126984,178
-,1.555736961,168
-,1.567346938,171
-,1.578956916,158
-,1.590566893,153
-,1.602176870,189
-,1.613786848,171
-,1.625396825,142
-,1.637006802,503
-,1.648616780,0
-,1.660226757,30
-,1.671836734,189
-,1.683446712,146
-,1.695056689,174
-,1.706666666,171
-,1.718276643,169
-,1.729886621,164
-,1.741496598,181
-,1.753106575,180
-,1.764716553,163
-,1.776326530,174
-,1.787936507,135
-,1.799546485,193
-,1.811156462,187
-,1.822766439,176
-,1.834376417,172
-,1.845986394,155
-,1.857596371,185
-,1.869206349,167
-,1.880816326,173
-,1.892426303,162
-,1.904036281,166
-,1.915646258,167
-,1.927256235,179
-,1.938866213,170
-,1.950476190,158
-,1.962086167,168
-,1.973696145,162
-,1.985306122,182
-,1.996916099,167
-,2.008526077,185
-,2.020136054,165
-,2.031746031,184
-,2.043356009,157
-,2.054965986,167
-,2.066575963,164
-,2.078185941,160
-,2.089795918,181
-,2.101405895,165
-,2.113015873,181
-,2.124625850,161
-,2.136235827,176
-,2.147845804,177
-,2.159455782,150
-,2.171065759,185
-,2.182675736,173
-,2.194285714,162
-,2.205895691,169
-,2.217505668,171
-,2.229115646,140
-,2.240725623,196
-,2.252335600,155
-,2.263945578,171
-,2.275555555,186
-,2.287165532,157
-,2.298775510,166
-,2.310385487,169
-,2.321995464,183
-,2.333605442,186
-,2.345215419,138
-,2.356825396,162
-,2.368435374,180
-,2.380045351,165
-,2.391655328,181
-,2.403265306,444
-,2.414875283,27
-,2.426485260,150
-,2.438095238,166
-,2.449705215,177
-,2.461315192,174
-,2.472925170,165
-,2.484535147,158
-,2.496145124,178
-,2.507755102,177
-,2.519365079,172
-,2.530975056,174
-,2.542585034,168
-,2.554195011,165
-,2.565804988,168
-,2.577414965,149
-,2.589024943,171
-,2.600634920,164
-,2.612244897,163
-,2.623854875,182
-,2.635464852,162
-,2.647074829,156
-,2.658684807,173
-,2.670294784,188
-,2.681904761,166
-,2.693514739,157
-,2.705124716,170
-,2.716734693,167
-,2.728344671,191
-,2.739954648,154
-,2.751564625,175
-,2.763174603,157
-,2.774784580,169
-,2.786394557,160
-,2.798004535,163
-,2.809614512,191
-,2.821224489,158
-,2.832834467,184
-,2.844444444,164
-,2.856054421,176
-,2.867664399,182
-,2.879274376,180
-,2.890884353,138
-,2.902494331,170
-,2.914104308,172
+,1.520907029,176
+,1.532517006,159
+,1.544126984,183
+,1.555736961,178
+,1.567346938,168
+,1.578956916,171
+,1.590566893,158
+,1.602176870,153
+,1.613786848,189
+,1.625396825,171
+,1.637006802,142
+,1.648616780,503
+,1.660226757,0
+,1.671836734,30
+,1.683446712,189
+,1.695056689,146
+,1.706666666,174
+,1.718276643,171
+,1.729886621,169
+,1.741496598,164
+,1.753106575,181
+,1.764716553,180
+,1.776326530,163
+,1.787936507,174
+,1.799546485,135
+,1.811156462,193
+,1.822766439,187
+,1.834376417,176
+,1.845986394,172
+,1.857596371,155
+,1.869206349,185
+,1.880816326,167
+,1.892426303,173
+,1.904036281,162
+,1.915646258,166
+,1.927256235,167
+,1.938866213,179
+,1.950476190,170
+,1.962086167,158
+,1.973696145,168
+,1.985306122,162
+,1.996916099,182
+,2.008526077,167
+,2.020136054,185
+,2.031746031,165
+,2.043356009,184
+,2.054965986,157
+,2.066575963,167
+,2.078185941,164
+,2.089795918,160
+,2.101405895,181
+,2.113015873,165
+,2.124625850,181
+,2.136235827,161
+,2.147845804,176
+,2.159455782,177
+,2.171065759,150
+,2.182675736,185
+,2.194285714,173
+,2.205895691,162
+,2.217505668,169
+,2.229115646,171
+,2.240725623,140
+,2.252335600,196
+,2.263945578,155
+,2.275555555,171
+,2.287165532,186
+,2.298775510,157
+,2.310385487,166
+,2.321995464,169
+,2.333605442,183
+,2.345215419,186
+,2.356825396,138
+,2.368435374,162
+,2.380045351,180
+,2.391655328,165
+,2.403265306,181
+,2.414875283,444
+,2.426485260,27
+,2.438095238,150
+,2.449705215,166
+,2.461315192,177
+,2.472925170,174
+,2.484535147,165
+,2.496145124,158
+,2.507755102,178
+,2.519365079,177
+,2.530975056,172
+,2.542585034,174
+,2.554195011,168
+,2.565804988,165
+,2.577414965,168
+,2.589024943,149
+,2.600634920,171
+,2.612244897,164
+,2.623854875,163
+,2.635464852,182
+,2.647074829,162
+,2.658684807,156
+,2.670294784,173
+,2.681904761,188
+,2.693514739,166
+,2.705124716,157
+,2.716734693,170
+,2.728344671,167
+,2.739954648,191
+,2.751564625,154
+,2.763174603,175
+,2.774784580,157
+,2.786394557,169
+,2.798004535,160
+,2.809614512,163
+,2.821224489,191
+,2.832834467,158
+,2.844444444,184
+,2.856054421,164
+,2.867664399,176
+,2.879274376,182
+,2.890884353,180
+,2.902494331,138
+,2.914104308,170
 ,2.925714285,172
-,2.937324263,168
-,2.948934240,186
-,2.960544217,171
-,2.972154195,154
-,2.983764172,185
-,2.995374149,172
-,3.006984126,164
-,3.018594104,176
-,3.030204081,195
-,3.041814058,160
-,3.053424036,124
-,3.065034013,181
-,3.076643990,170
-,3.088253968,178
-,3.099863945,165
-,3.111473922,164
-,3.123083900,194
-,3.134693877,157
-,3.146303854,205
-,3.157913832,163
-,3.169523809,159
-,3.181133786,184
-,3.192743764,145
-,3.204353741,170
-,3.215963718,155
-,3.227573696,161
-,3.239183673,164
-,3.250793650,184
-,3.262403628,175
-,3.274013605,155
-,3.285623582,164
-,3.297233560,181
-,3.308843537,182
-,3.320453514,145
-,3.332063492,177
-,3.343673469,162
-,3.355283446,153
-,3.366893424,185
-,3.378503401,174
-,3.390113378,167
-,3.401723356,187
-,3.413333333,157
-,3.424943310,170
-,3.436553287,169
-,3.448163265,166
-,3.459773242,171
-,3.471383219,165
-,3.482993197,158
-,3.494603174,181
-,3.506213151,168
-,3.517823129,175
-,3.529433106,162
-,3.541043083,167
-,3.552653061,179
-,3.564263038,167
-,3.575873015,156
-,3.587482993,209
-,3.599092970,179
-,3.610702947,159
-,3.622312925,180
-,3.633922902,152
-,3.645532879,169
-,3.657142857,189
-,3.668752834,170
-,3.680362811,156
-,3.691972789,165
-,3.703582766,179
-,3.715192743,173
-,3.726802721,163
-,3.738412698,170
-,3.750022675,181
-,3.761632653,177
-,3.773242630,181
-,3.784852607,166
-,3.796462585,153
-,3.808072562,164
-,3.819682539,209
-,3.831292517,159
-,3.842902494,194
-,3.854512471,164
-,3.866122448,184
-,3.877732426,163
-,3.889342403,173
-,3.900952380,165
-,3.912562358,164
-,3.924172335,182
-,3.935782312,170
-,3.947392290,160
-,3.959002267,173
-,3.970612244,160
-,3.982222222,174
-,3.993832199,179
+,2.937324263,172
+,2.948934240,168
+,2.960544217,186
+,2.972154195,171
+,2.983764172,154
+,2.995374149,185
+,3.006984126,172
+,3.018594104,164
+,3.030204081,176
+,3.041814058,195
+,3.053424036,160
+,3.065034013,124
+,3.076643990,181
+,3.088253968,170
+,3.099863945,178
+,3.111473922,165
+,3.123083900,164
+,3.134693877,194
+,3.146303854,157
+,3.157913832,205
+,3.169523809,163
+,3.181133786,159
+,3.192743764,184
+,3.204353741,145
+,3.215963718,170
+,3.227573696,155
+,3.239183673,161
+,3.250793650,164
+,3.262403628,184
+,3.274013605,175
+,3.285623582,155
+,3.297233560,164
+,3.308843537,181
+,3.320453514,182
+,3.332063492,145
+,3.343673469,177
+,3.355283446,162
+,3.366893424,153
+,3.378503401,185
+,3.390113378,174
+,3.401723356,167
+,3.413333333,187
+,3.424943310,157
+,3.436553287,170
+,3.448163265,169
+,3.459773242,166
+,3.471383219,171
+,3.482993197,165
+,3.494603174,158
+,3.506213151,181
+,3.517823129,168
+,3.529433106,175
+,3.541043083,162
+,3.552653061,167
+,3.564263038,179
+,3.575873015,167
+,3.587482993,156
+,3.599092970,209
+,3.610702947,179
+,3.622312925,159
+,3.633922902,180
+,3.645532879,152
+,3.657142857,169
+,3.668752834,189
+,3.680362811,170
+,3.691972789,156
+,3.703582766,165
+,3.715192743,179
+,3.726802721,173
+,3.738412698,163
+,3.750022675,170
+,3.761632653,181
+,3.773242630,177
+,3.784852607,181
+,3.796462585,166
+,3.808072562,153
+,3.819682539,164
+,3.831292517,209
+,3.842902494,159
+,3.854512471,194
+,3.866122448,164
+,3.877732426,184
+,3.889342403,163
+,3.900952380,173
+,3.912562358,165
+,3.924172335,164
+,3.935782312,182
+,3.947392290,170
+,3.959002267,160
+,3.970612244,173
+,3.982222222,160
+,3.993832199,174
 ,4.005442176,179
-,4.017052154,145
-,4.028662131,196
-,4.040272108,155
-,4.051882086,170
-,4.063492063,180
-,4.075102040,156
-,4.086712018,159
-,4.098321995,182
-,4.109931972,175
-,4.121541950,173
-,4.133151927,164
-,4.144761904,186
-,4.156371882,160
-,4.167981859,175
-,4.179591836,178
-,4.191201814,159
-,4.202811791,177
-,4.214421768,181
-,4.226031746,177
-,4.237641723,163
-,4.249251700,158
-,4.260861678,188
-,4.272471655,163
-,4.284081632,158
-,4.295691609,164
+,4.017052154,179
+,4.028662131,145
+,4.040272108,196
+,4.051882086,155
+,4.063492063,170
+,4.075102040,180
+,4.086712018,156
+,4.098321995,159
+,4.109931972,182
+,4.121541950,175
+,4.133151927,173
+,4.144761904,164
+,4.156371882,186
+,4.167981859,160
+,4.179591836,175
+,4.191201814,178
+,4.202811791,159
+,4.214421768,177
+,4.226031746,181
+,4.237641723,177
+,4.249251700,163
+,4.260861678,158
+,4.272471655,188
+,4.284081632,163
+,4.295691609,158
 ,4.307301587,164
-,4.318911564,183
-,4.330521541,160
-,4.342131519,182
-,4.353741496,172
+,4.318911564,164
+,4.330521541,183
+,4.342131519,160
+,4.353741496,182
 ,4.365351473,172
-,4.376961451,179
-,4.388571428,154
-,4.400181405,166
-,4.411791383,174
-,4.423401360,156
-,4.435011337,174
-,4.446621315,169
+,4.376961451,172
+,4.388571428,179
+,4.400181405,154
+,4.411791383,166
+,4.423401360,174
+,4.435011337,156
+,4.446621315,174
 ,4.458231292,169
-,4.469841269,178
-,4.481451247,175
-,4.493061224,193
-,4.504671201,153
-,4.516281179,160
-,4.527891156,176
-,4.539501133,167
-,4.551111111,184
-,4.562721088,163
-,4.574331065,150
-,4.585941043,156
-,4.597551020,182
-,4.609160997,168
+,4.469841269,169
+,4.481451247,178
+,4.493061224,175
+,4.504671201,193
+,4.516281179,153
+,4.527891156,160
+,4.539501133,176
+,4.551111111,167
+,4.562721088,184
+,4.574331065,163
+,4.585941043,150
+,4.597551020,156
+,4.609160997,182
 ,4.620770975,168
-,4.632380952,152
-,4.643990929,174
-,4.655600907,186
-,4.667210884,168
-,4.678820861,173
-,4.690430839,184
-,4.702040816,169
-,4.713650793,166
-,4.725260770,164
-,4.736870748,193
-,4.748480725,155
-,4.760090702,164
-,4.771700680,181
-,4.783310657,142
-,4.794920634,183
-,4.806530612,181
-,4.818140589,185
-,4.829750566,171
-,4.841360544,184
-,4.852970521,156
-,4.864580498,162
-,4.876190476,182
-,4.887800453,161
-,4.899410430,175
-,4.911020408,168
-,4.922630385,172
-,4.934240362,151
-,4.945850340,176
-,4.957460317,171
-,4.969070294,93
-,4.980680272,0
+,4.632380952,168
+,4.643990929,152
+,4.655600907,174
+,4.667210884,186
+,4.678820861,168
+,4.690430839,173
+,4.702040816,184
+,4.713650793,169
+,4.725260770,166
+,4.736870748,164
+,4.748480725,193
+,4.760090702,155
+,4.771700680,164
+,4.783310657,181
+,4.794920634,142
+,4.806530612,183
+,4.818140589,181
+,4.829750566,185
+,4.841360544,171
+,4.852970521,184
+,4.864580498,156
+,4.876190476,162
+,4.887800453,182
+,4.899410430,161
+,4.911020408,175
+,4.922630385,168
+,4.934240362,172
+,4.945850340,151
+,4.957460317,176
+,4.969070294,171
+,4.980680272,93
 ,4.992290249,0
 ,5.003900226,0
 ,5.015510204,0
@@ -446,4 +446,4 @@
 ,5.166439909,0
 ,5.178049886,0
 ,5.189659863,0
-,0.000000000,5.201269840,mean,162.123,"(mean value, continuous-time average)"
+,0.000000000,5.201269840,mean,162.585,"(mean value, continuous-time average)"
--- a/tests/expected/transforms-summaries-percussiononsets.csv	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/expected/transforms-summaries-percussiononsets.csv	Fri Sep 25 12:00:58 2009 +0000
@@ -1,433 +1,433 @@
 "./audio/3clicks8.wav",0.000000000,0
-,0.011609977,170
-,0.023219954,184
-,0.034829931,166
-,0.046439909,174
-,0.058049886,179
-,0.069659863,162
-,0.081269841,157
-,0.092879818,156
-,0.104489795,182
-,0.116099773,168
+,0.011609977,207
+,0.023219954,170
+,0.034829931,184
+,0.046439909,166
+,0.058049886,174
+,0.069659863,179
+,0.081269841,162
+,0.092879818,157
+,0.104489795,156
+,0.116099773,182
 ,0.127709750,168
-,0.139319727,155
-,0.150929705,200
-,0.162539682,163
-,0.174149659,178
-,0.185759637,164
-,0.197369614,166
-,0.208979591,137
-,0.220589569,155
-,0.232199546,177
-,0.243809523,145
-,0.255419501,172
-,0.267029478,155
-,0.278639455,201
-,0.290249433,166
-,0.301859410,169
-,0.313469387,158
-,0.325079365,169
-,0.336689342,155
-,0.348299319,187
-,0.359909297,177
-,0.371519274,149
-,0.383129251,196
-,0.394739229,160
-,0.406349206,174
-,0.417959183,165
-,0.429569160,149
-,0.441179138,181
-,0.452789115,180
-,0.464399092,156
-,0.476009070,163
-,0.487619047,188
-,0.499229024,173
-,0.510839002,160
-,0.522448979,168
-,0.534058956,154
-,0.545668934,155
-,0.557278911,161
-,0.568888888,163
-,0.580498866,172
-,0.592108843,168
-,0.603718820,181
-,0.615328798,167
-,0.626938775,172
-,0.638548752,158
-,0.650158730,172
-,0.661768707,167
-,0.673378684,180
-,0.684988662,188
-,0.696598639,160
-,0.708208616,166
-,0.719818594,158
-,0.731428571,176
-,0.743038548,153
-,0.754648526,173
-,0.766258503,449
-,0.777868480,30
-,0.789478458,70
-,0.801088435,181
-,0.812698412,165
-,0.824308390,174
-,0.835918367,181
-,0.847528344,179
-,0.859138321,154
-,0.870748299,169
-,0.882358276,150
-,0.893968253,189
-,0.905578231,159
-,0.917188208,172
-,0.928798185,157
-,0.940408163,167
-,0.952018140,169
-,0.963628117,155
-,0.975238095,189
-,0.986848072,178
-,0.998458049,168
-,1.010068027,169
-,1.021678004,178
-,1.033287981,157
-,1.044897959,166
-,1.056507936,162
-,1.068117913,170
-,1.079727891,186
-,1.091337868,178
+,0.139319727,168
+,0.150929705,155
+,0.162539682,200
+,0.174149659,163
+,0.185759637,178
+,0.197369614,164
+,0.208979591,166
+,0.220589569,137
+,0.232199546,155
+,0.243809523,177
+,0.255419501,145
+,0.267029478,172
+,0.278639455,155
+,0.290249433,201
+,0.301859410,166
+,0.313469387,169
+,0.325079365,158
+,0.336689342,169
+,0.348299319,155
+,0.359909297,187
+,0.371519274,177
+,0.383129251,149
+,0.394739229,196
+,0.406349206,160
+,0.417959183,174
+,0.429569160,165
+,0.441179138,149
+,0.452789115,181
+,0.464399092,180
+,0.476009070,156
+,0.487619047,163
+,0.499229024,188
+,0.510839002,173
+,0.522448979,160
+,0.534058956,168
+,0.545668934,154
+,0.557278911,155
+,0.568888888,161
+,0.580498866,163
+,0.592108843,172
+,0.603718820,168
+,0.615328798,181
+,0.626938775,167
+,0.638548752,172
+,0.650158730,158
+,0.661768707,172
+,0.673378684,167
+,0.684988662,180
+,0.696598639,188
+,0.708208616,160
+,0.719818594,166
+,0.731428571,158
+,0.743038548,176
+,0.754648526,153
+,0.766258503,173
+,0.777868480,449
+,0.789478458,30
+,0.801088435,70
+,0.812698412,181
+,0.824308390,165
+,0.835918367,174
+,0.847528344,181
+,0.859138321,179
+,0.870748299,154
+,0.882358276,169
+,0.893968253,150
+,0.905578231,189
+,0.917188208,159
+,0.928798185,172
+,0.940408163,157
+,0.952018140,167
+,0.963628117,169
+,0.975238095,155
+,0.986848072,189
+,0.998458049,178
+,1.010068027,168
+,1.021678004,169
+,1.033287981,178
+,1.044897959,157
+,1.056507936,166
+,1.068117913,162
+,1.079727891,170
+,1.091337868,186
 ,1.102947845,178
-,1.114557823,155
-,1.126167800,173
-,1.137777777,156
-,1.149387755,158
-,1.160997732,170
-,1.172607709,167
-,1.184217687,160
-,1.195827664,180
-,1.207437641,153
-,1.219047619,154
-,1.230657596,171
-,1.242267573,159
-,1.253877551,194
-,1.265487528,170
-,1.277097505,157
-,1.288707482,184
-,1.300317460,156
-,1.311927437,173
-,1.323537414,184
-,1.335147392,168
-,1.346757369,182
-,1.358367346,147
-,1.369977324,164
-,1.381587301,163
-,1.393197278,165
-,1.404807256,181
-,1.416417233,172
-,1.428027210,169
-,1.439637188,165
-,1.451247165,166
-,1.462857142,158
-,1.474467120,162
-,1.486077097,188
-,1.497687074,176
+,1.114557823,178
+,1.126167800,155
+,1.137777777,173
+,1.149387755,156
+,1.160997732,158
+,1.172607709,170
+,1.184217687,167
+,1.195827664,160
+,1.207437641,180
+,1.219047619,153
+,1.230657596,154
+,1.242267573,171
+,1.253877551,159
+,1.265487528,194
+,1.277097505,170
+,1.288707482,157
+,1.300317460,184
+,1.311927437,156
+,1.323537414,173
+,1.335147392,184
+,1.346757369,168
+,1.358367346,182
+,1.369977324,147
+,1.381587301,164
+,1.393197278,163
+,1.404807256,165
+,1.416417233,181
+,1.428027210,172
+,1.439637188,169
+,1.451247165,165
+,1.462857142,166
+,1.474467120,158
+,1.486077097,162
+,1.497687074,188
 ,1.509297052,176
-,1.520907029,159
-,1.532517006,183
-,1.544126984,178
-,1.555736961,168
-,1.567346938,171
-,1.578956916,158
-,1.590566893,153
-,1.602176870,189
-,1.613786848,171
-,1.625396825,142
-,1.637006802,503
-,1.648616780,0
-,1.660226757,30
-,1.671836734,189
-,1.683446712,146
-,1.695056689,174
-,1.706666666,171
-,1.718276643,169
-,1.729886621,164
-,1.741496598,181
-,1.753106575,180
-,1.764716553,163
-,1.776326530,174
-,1.787936507,135
-,1.799546485,193
-,1.811156462,187
-,1.822766439,176
-,1.834376417,172
-,1.845986394,155
-,1.857596371,185
-,1.869206349,167
-,1.880816326,173
-,1.892426303,162
-,1.904036281,166
-,1.915646258,167
-,1.927256235,179
-,1.938866213,170
-,1.950476190,158
-,1.962086167,168
-,1.973696145,162
-,1.985306122,182
-,1.996916099,167
-,2.008526077,185
-,2.020136054,165
-,2.031746031,184
-,2.043356009,157
-,2.054965986,167
-,2.066575963,164
-,2.078185941,160
-,2.089795918,181
-,2.101405895,165
-,2.113015873,181
-,2.124625850,161
-,2.136235827,176
-,2.147845804,177
-,2.159455782,150
-,2.171065759,185
-,2.182675736,173
-,2.194285714,162
-,2.205895691,169
-,2.217505668,171
-,2.229115646,140
-,2.240725623,196
-,2.252335600,155
-,2.263945578,171
-,2.275555555,186
-,2.287165532,157
-,2.298775510,166
-,2.310385487,169
-,2.321995464,183
-,2.333605442,186
-,2.345215419,138
-,2.356825396,162
-,2.368435374,180
-,2.380045351,165
-,2.391655328,181
-,2.403265306,444
-,2.414875283,27
-,2.426485260,150
-,2.438095238,166
-,2.449705215,177
-,2.461315192,174
-,2.472925170,165
-,2.484535147,158
-,2.496145124,178
-,2.507755102,177
-,2.519365079,172
-,2.530975056,174
-,2.542585034,168
-,2.554195011,165
-,2.565804988,168
-,2.577414965,149
-,2.589024943,171
-,2.600634920,164
-,2.612244897,163
-,2.623854875,182
-,2.635464852,162
-,2.647074829,156
-,2.658684807,173
-,2.670294784,188
-,2.681904761,166
-,2.693514739,157
-,2.705124716,170
-,2.716734693,167
-,2.728344671,191
-,2.739954648,154
-,2.751564625,175
-,2.763174603,157
-,2.774784580,169
-,2.786394557,160
-,2.798004535,163
-,2.809614512,191
-,2.821224489,158
-,2.832834467,184
-,2.844444444,164
-,2.856054421,176
-,2.867664399,182
-,2.879274376,180
-,2.890884353,138
-,2.902494331,170
-,2.914104308,172
+,1.520907029,176
+,1.532517006,159
+,1.544126984,183
+,1.555736961,178
+,1.567346938,168
+,1.578956916,171
+,1.590566893,158
+,1.602176870,153
+,1.613786848,189
+,1.625396825,171
+,1.637006802,142
+,1.648616780,503
+,1.660226757,0
+,1.671836734,30
+,1.683446712,189
+,1.695056689,146
+,1.706666666,174
+,1.718276643,171
+,1.729886621,169
+,1.741496598,164
+,1.753106575,181
+,1.764716553,180
+,1.776326530,163
+,1.787936507,174
+,1.799546485,135
+,1.811156462,193
+,1.822766439,187
+,1.834376417,176
+,1.845986394,172
+,1.857596371,155
+,1.869206349,185
+,1.880816326,167
+,1.892426303,173
+,1.904036281,162
+,1.915646258,166
+,1.927256235,167
+,1.938866213,179
+,1.950476190,170
+,1.962086167,158
+,1.973696145,168
+,1.985306122,162
+,1.996916099,182
+,2.008526077,167
+,2.020136054,185
+,2.031746031,165
+,2.043356009,184
+,2.054965986,157
+,2.066575963,167
+,2.078185941,164
+,2.089795918,160
+,2.101405895,181
+,2.113015873,165
+,2.124625850,181
+,2.136235827,161
+,2.147845804,176
+,2.159455782,177
+,2.171065759,150
+,2.182675736,185
+,2.194285714,173
+,2.205895691,162
+,2.217505668,169
+,2.229115646,171
+,2.240725623,140
+,2.252335600,196
+,2.263945578,155
+,2.275555555,171
+,2.287165532,186
+,2.298775510,157
+,2.310385487,166
+,2.321995464,169
+,2.333605442,183
+,2.345215419,186
+,2.356825396,138
+,2.368435374,162
+,2.380045351,180
+,2.391655328,165
+,2.403265306,181
+,2.414875283,444
+,2.426485260,27
+,2.438095238,150
+,2.449705215,166
+,2.461315192,177
+,2.472925170,174
+,2.484535147,165
+,2.496145124,158
+,2.507755102,178
+,2.519365079,177
+,2.530975056,172
+,2.542585034,174
+,2.554195011,168
+,2.565804988,165
+,2.577414965,168
+,2.589024943,149
+,2.600634920,171
+,2.612244897,164
+,2.623854875,163
+,2.635464852,182
+,2.647074829,162
+,2.658684807,156
+,2.670294784,173
+,2.681904761,188
+,2.693514739,166
+,2.705124716,157
+,2.716734693,170
+,2.728344671,167
+,2.739954648,191
+,2.751564625,154
+,2.763174603,175
+,2.774784580,157
+,2.786394557,169
+,2.798004535,160
+,2.809614512,163
+,2.821224489,191
+,2.832834467,158
+,2.844444444,184
+,2.856054421,164
+,2.867664399,176
+,2.879274376,182
+,2.890884353,180
+,2.902494331,138
+,2.914104308,170
 ,2.925714285,172
-,2.937324263,168
-,2.948934240,186
-,2.960544217,171
-,2.972154195,154
-,2.983764172,185
-,2.995374149,172
-,3.006984126,164
-,3.018594104,176
-,3.030204081,195
-,3.041814058,160
-,3.053424036,124
-,3.065034013,181
-,3.076643990,170
-,3.088253968,178
-,3.099863945,165
-,3.111473922,164
-,3.123083900,194
-,3.134693877,157
-,3.146303854,205
-,3.157913832,163
-,3.169523809,159
-,3.181133786,184
-,3.192743764,145
-,3.204353741,170
-,3.215963718,155
-,3.227573696,161
-,3.239183673,164
-,3.250793650,184
-,3.262403628,175
-,3.274013605,155
-,3.285623582,164
-,3.297233560,181
-,3.308843537,182
-,3.320453514,145
-,3.332063492,177
-,3.343673469,162
-,3.355283446,153
-,3.366893424,185
-,3.378503401,174
-,3.390113378,167
-,3.401723356,187
-,3.413333333,157
-,3.424943310,170
-,3.436553287,169
-,3.448163265,166
-,3.459773242,171
-,3.471383219,165
-,3.482993197,158
-,3.494603174,181
-,3.506213151,168
-,3.517823129,175
-,3.529433106,162
-,3.541043083,167
-,3.552653061,179
-,3.564263038,167
-,3.575873015,156
-,3.587482993,209
-,3.599092970,179
-,3.610702947,159
-,3.622312925,180
-,3.633922902,152
-,3.645532879,169
-,3.657142857,189
-,3.668752834,170
-,3.680362811,156
-,3.691972789,165
-,3.703582766,179
-,3.715192743,173
-,3.726802721,163
-,3.738412698,170
-,3.750022675,181
-,3.761632653,177
-,3.773242630,181
-,3.784852607,166
-,3.796462585,153
-,3.808072562,164
-,3.819682539,209
-,3.831292517,159
-,3.842902494,194
-,3.854512471,164
-,3.866122448,184
-,3.877732426,163
-,3.889342403,173
-,3.900952380,165
-,3.912562358,164
-,3.924172335,182
-,3.935782312,170
-,3.947392290,160
-,3.959002267,173
-,3.970612244,160
-,3.982222222,174
-,3.993832199,179
+,2.937324263,172
+,2.948934240,168
+,2.960544217,186
+,2.972154195,171
+,2.983764172,154
+,2.995374149,185
+,3.006984126,172
+,3.018594104,164
+,3.030204081,176
+,3.041814058,195
+,3.053424036,160
+,3.065034013,124
+,3.076643990,181
+,3.088253968,170
+,3.099863945,178
+,3.111473922,165
+,3.123083900,164
+,3.134693877,194
+,3.146303854,157
+,3.157913832,205
+,3.169523809,163
+,3.181133786,159
+,3.192743764,184
+,3.204353741,145
+,3.215963718,170
+,3.227573696,155
+,3.239183673,161
+,3.250793650,164
+,3.262403628,184
+,3.274013605,175
+,3.285623582,155
+,3.297233560,164
+,3.308843537,181
+,3.320453514,182
+,3.332063492,145
+,3.343673469,177
+,3.355283446,162
+,3.366893424,153
+,3.378503401,185
+,3.390113378,174
+,3.401723356,167
+,3.413333333,187
+,3.424943310,157
+,3.436553287,170
+,3.448163265,169
+,3.459773242,166
+,3.471383219,171
+,3.482993197,165
+,3.494603174,158
+,3.506213151,181
+,3.517823129,168
+,3.529433106,175
+,3.541043083,162
+,3.552653061,167
+,3.564263038,179
+,3.575873015,167
+,3.587482993,156
+,3.599092970,209
+,3.610702947,179
+,3.622312925,159
+,3.633922902,180
+,3.645532879,152
+,3.657142857,169
+,3.668752834,189
+,3.680362811,170
+,3.691972789,156
+,3.703582766,165
+,3.715192743,179
+,3.726802721,173
+,3.738412698,163
+,3.750022675,170
+,3.761632653,181
+,3.773242630,177
+,3.784852607,181
+,3.796462585,166
+,3.808072562,153
+,3.819682539,164
+,3.831292517,209
+,3.842902494,159
+,3.854512471,194
+,3.866122448,164
+,3.877732426,184
+,3.889342403,163
+,3.900952380,173
+,3.912562358,165
+,3.924172335,164
+,3.935782312,182
+,3.947392290,170
+,3.959002267,160
+,3.970612244,173
+,3.982222222,160
+,3.993832199,174
 ,4.005442176,179
-,4.017052154,145
-,4.028662131,196
-,4.040272108,155
-,4.051882086,170
-,4.063492063,180
-,4.075102040,156
-,4.086712018,159
-,4.098321995,182
-,4.109931972,175
-,4.121541950,173
-,4.133151927,164
-,4.144761904,186
-,4.156371882,160
-,4.167981859,175
-,4.179591836,178
-,4.191201814,159
-,4.202811791,177
-,4.214421768,181
-,4.226031746,177
-,4.237641723,163
-,4.249251700,158
-,4.260861678,188
-,4.272471655,163
-,4.284081632,158
-,4.295691609,164
+,4.017052154,179
+,4.028662131,145
+,4.040272108,196
+,4.051882086,155
+,4.063492063,170
+,4.075102040,180
+,4.086712018,156
+,4.098321995,159
+,4.109931972,182
+,4.121541950,175
+,4.133151927,173
+,4.144761904,164
+,4.156371882,186
+,4.167981859,160
+,4.179591836,175
+,4.191201814,178
+,4.202811791,159
+,4.214421768,177
+,4.226031746,181
+,4.237641723,177
+,4.249251700,163
+,4.260861678,158
+,4.272471655,188
+,4.284081632,163
+,4.295691609,158
 ,4.307301587,164
-,4.318911564,183
-,4.330521541,160
-,4.342131519,182
-,4.353741496,172
+,4.318911564,164
+,4.330521541,183
+,4.342131519,160
+,4.353741496,182
 ,4.365351473,172
-,4.376961451,179
-,4.388571428,154
-,4.400181405,166
-,4.411791383,174
-,4.423401360,156
-,4.435011337,174
-,4.446621315,169
+,4.376961451,172
+,4.388571428,179
+,4.400181405,154
+,4.411791383,166
+,4.423401360,174
+,4.435011337,156
+,4.446621315,174
 ,4.458231292,169
-,4.469841269,178
-,4.481451247,175
-,4.493061224,193
-,4.504671201,153
-,4.516281179,160
-,4.527891156,176
-,4.539501133,167
-,4.551111111,184
-,4.562721088,163
-,4.574331065,150
-,4.585941043,156
-,4.597551020,182
-,4.609160997,168
+,4.469841269,169
+,4.481451247,178
+,4.493061224,175
+,4.504671201,193
+,4.516281179,153
+,4.527891156,160
+,4.539501133,176
+,4.551111111,167
+,4.562721088,184
+,4.574331065,163
+,4.585941043,150
+,4.597551020,156
+,4.609160997,182
 ,4.620770975,168
-,4.632380952,152
-,4.643990929,174
-,4.655600907,186
-,4.667210884,168
-,4.678820861,173
-,4.690430839,184
-,4.702040816,169
-,4.713650793,166
-,4.725260770,164
-,4.736870748,193
-,4.748480725,155
-,4.760090702,164
-,4.771700680,181
-,4.783310657,142
-,4.794920634,183
-,4.806530612,181
-,4.818140589,185
-,4.829750566,171
-,4.841360544,184
-,4.852970521,156
-,4.864580498,162
-,4.876190476,182
-,4.887800453,161
-,4.899410430,175
-,4.911020408,168
-,4.922630385,172
-,4.934240362,151
-,4.945850340,176
-,4.957460317,171
-,4.969070294,93
-,4.980680272,0
+,4.632380952,168
+,4.643990929,152
+,4.655600907,174
+,4.667210884,186
+,4.678820861,168
+,4.690430839,173
+,4.702040816,184
+,4.713650793,169
+,4.725260770,166
+,4.736870748,164
+,4.748480725,193
+,4.760090702,155
+,4.771700680,164
+,4.783310657,181
+,4.794920634,142
+,4.806530612,183
+,4.818140589,181
+,4.829750566,185
+,4.841360544,171
+,4.852970521,184
+,4.864580498,156
+,4.876190476,162
+,4.887800453,182
+,4.899410430,161
+,4.911020408,175
+,4.922630385,168
+,4.934240362,172
+,4.945850340,151
+,4.957460317,176
+,4.969070294,171
+,4.980680272,93
 ,4.992290249,0
 ,5.003900226,0
 ,5.015510204,0
--- a/tests/test-audioformat.sh	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/test-audioformat.sh	Fri Sep 25 12:00:58 2009 +0000
@@ -10,10 +10,7 @@
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
+. test-include.sh
 
 for extension in wav ogg mp3 ; do
 
@@ -36,10 +33,10 @@
 	fail "Fails to run transform $transform against audio file $infile"
 
     if [ "$extension" = "wav" ]; then
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    fail "Output mismatch for transform $transform with audio file $infile"
     else
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    ( echo "NOTE: Output mismatch for transform $transform with audio file $infile" ; \
 	      echo "This may be the result of differences in the audio file decoder, so I am not" ; \
 	      echo "failing the test, but I recommend that you check the results." )
--- a/tests/test-summaries.sh	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/test-summaries.sh	Fri Sep 25 12:00:58 2009 +0000
@@ -11,7 +11,9 @@
 
 trap "rm -f $tmpfile $tmpcanonical $tmpcmp1 $tmpcmp2" 0
 
-fail() {
+. test-include.sh
+
+faildiff() {
     echo "Test failed: $1"
     if [ -n "$2" -a -n "$3" ]; then
 	echo "Output follows:"
@@ -24,7 +26,7 @@
 	echo "--"
 	echo "Diff:"
 	echo "--"
-	diff -u $2 $3
+	sdiff -w78 $2 $3
 	echo "--"
     fi
     exit 1
@@ -35,7 +37,7 @@
     b=$2
     sort $a > $tmpcmp1
     sort $b > $tmpcmp2
-    cmp -s $tmpcmp1 $tmpcmp2
+    csvcompare $tmpcmp1 $tmpcmp2
 }
 
 # transform to which we have to add summarisation on command line
@@ -49,25 +51,25 @@
     fail "Fails to run transform $transform"
 
 compare $tmpfile ${expected}.csv || \
-    fail "Output mismatch for transform $transform" $tmpfile ${expected}.csv
+    faildiff "Output mismatch for transform $transform" $tmpfile ${expected}.csv
 
 $r -t $transform -w csv --csv-stdout -S mean $infile > $tmpfile 2>/dev/null || \
     fail "Fails to run transform $transform with summary type mean"
 
 compare $tmpfile ${expected}-with-mean.csv || \
-    fail "Output mismatch for transform $transform with summary type mean" $tmpfile ${expected}-with-mean.csv
+    faildiff "Output mismatch for transform $transform with summary type mean" $tmpfile ${expected}-with-mean.csv
 
 $r -t $transform -w csv --csv-stdout -S min -S max -S mean -S median -S mode -S sum -S variance -S sd -S count --summary-only $infile > $tmpfile 2>/dev/null || \
     fail "Fails to run transform $transform with all summary types and summary-only"
 
 compare $tmpfile ${expected}-all-summaries-only.csv || \
-    fail "Output mismatch for transform $transform with all summary types and summary-only" $tmpfile ${expected}-all-summaries-only.csv
+    faildiff "Output mismatch for transform $transform with all summary types and summary-only" $tmpfile ${expected}-all-summaries-only.csv
 
 $r -t $stransform -w csv --csv-stdout $infile > $tmpfile 2>/dev/null || \
     fail "Fails to run transform $stransform with CSV output"
 
 compare $tmpfile ${sexpected}.csv || \
-    fail "Output mismatch for transform $stransform" $tmpfile ${sexpected}.csv
+    faildiff "Output mismatch for transform $stransform" $tmpfile ${sexpected}.csv
 
 $r -t $stransform -w rdf --rdf-stdout $infile > $tmpfile 2>/dev/null || \
     fail "Fails to run transform $stransform with RDF output"
@@ -76,7 +78,7 @@
     fail "Fails to produce parseable RDF/TTL for transform $stransform"
 
 compare $tmpcanonical ${sexpected}.n3 || \
-    fail "Output mismatch for canonicalised version of transform $stransform" $tmpcanonical ${sexpected}.n3
+    faildiff "Output mismatch for canonicalised version of transform $stransform" $tmpcanonical ${sexpected}.n3
 
 exit 0
 
--- a/tests/test-transforms-basic.sh	Thu Sep 24 14:34:00 2009 +0000
+++ b/tests/test-transforms-basic.sh	Fri Sep 25 12:00:58 2009 +0000
@@ -10,10 +10,7 @@
 
 trap "rm -f $tmpfile1 $tmpfile2" 0
 
-fail() {
-    echo "Test failed: $1"
-    exit 1
-}
+. test-include.sh
 
 $r --skeleton $testplug > $tmpfile1 2>/dev/null || \
     fail "Fails to run with --skeleton $testplug"
@@ -21,7 +18,7 @@
 $r -t $tmpfile1 -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
     fail "Fails to run with -t $tmpfile -w csv --csv-stdout $infile"
 
-cmp -s $tmpfile2 $mypath/expected/transforms-basic-skeleton-1.csv || \
+csvcompare $tmpfile2 $mypath/expected/transforms-basic-skeleton-1.csv || \
     fail "Output mismatch for transforms-basic-skeleton-1.csv"
 
 for suffix in \
@@ -47,7 +44,7 @@
 	$r -t $transform -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
 	    fail "Fails to run transform $transform"
 
-	cmp -s $tmpfile2 $expected || \
+	csvcompare $tmpfile2 $expected || \
 	    fail "Output mismatch for transform $transform"
     done
 done