# HG changeset patch
# User Chris Cannam
# Date 1471513510 -3600
# Node ID 88261e7c1db87f8b2d65ea733dccb28ba515c409
# Parent  e506ffa4591bede93f7aaffdc3a97e9eca8e4ad3
Use a different test signal, update expected files for fsr modes

diff -r e506ffa4591b -r 88261e7c1db8 test/20sec-silence.wav
Binary file test/20sec-silence.wav has changed
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin-freq_curve-fsr-timed.txt
--- a/test/expected/vamp-test-plugin-freq_curve-fsr-timed.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin-freq_curve-fsr-timed.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
-=== vamp-test-plugin:vamp-test-plugin-freq:curve-fsr-timed
+=== vamp-test-plugin:vamp-test-plugin:curve-fsr-timed
  0.000000000: 0 1 of 10: 0 at 0 snap to 0
  0.000000000: 0.1 2 of 10: 0.1 at 0 snap to 0
- 0.166666672: 0.2 3 of 10: 0.2 at 0.166 snap to 0
- 0.333333343: 0.3 4 of 10: 0.3 at 0.333 snap to 0.4
+ 0.000000000: 0.2 3 of 10: 0.2 at 0.166 snap to 0
+ 0.400000000: 0.3 4 of 10: 0.3 at 0.333 snap to 0.4
  2.000000000: 0.4 5 of 10: 0.4 at 2 snap to 2
  2.000000000: 0.5 6 of 10: 0.5 at 2 snap to 2
- 2.166666746: 0.6 7 of 10: 0.6 at 2.166 snap to 2
- 2.333333254: 0.7 8 of 10: 0.7 at 2.333 snap to 2.4
+ 2.000000000: 0.6 7 of 10: 0.6 at 2.166 snap to 2
+ 2.400000000: 0.7 8 of 10: 0.7 at 2.333 snap to 2.4
  4.000000000: 0.8 9 of 10: 0.8 at 4 snap to 4
  4.000000000: 0.9 10 of 10: 0.9 at 4 snap to 4
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin-freq_curve-fsr.txt
--- a/test/expected/vamp-test-plugin-freq_curve-fsr.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin-freq_curve-fsr.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
-=== vamp-test-plugin:vamp-test-plugin-freq:curve-fsr
- 0.011609977: 0 1 of 10: 0 at 0
- 0.023219954: 0.1 2 of 10: 0.1 at 0.4
- 0.034829931: 0.2 3 of 10: 0.2 at 0.8
- 0.046417233: 0.3 4 of 10: 0.3 at 1.2
- 0.058049886: 0.4 5 of 10: 0.4 at 1.6
- 20.003990929: 0.5 6 of 10: 0.5 at 2
- 20.003990929: 0.6 7 of 10: 0.6 at 2.4
- 20.003990929: 0.7 8 of 10: 0.7 at 2.8
- 20.003990929: 0.8 9 of 10: 0.8 at 3.2
- 20.003990929: 0.9 10 of 10: 0.9 at 3.6
+=== vamp-test-plugin:vamp-test-plugin:curve-fsr
+ 0.000000000: 0 1 of 10: 0 at 0
+ 0.400000000: 0.1 2 of 10: 0.1 at 0.4
+ 0.800000000: 0.2 3 of 10: 0.2 at 0.8
+ 1.200000000: 0.3 4 of 10: 0.3 at 1.2
+ 1.600000000: 0.4 5 of 10: 0.4 at 1.6
+ 2.000000000: 0.5 6 of 10: 0.5 at 2
+ 2.400000000: 0.6 7 of 10: 0.6 at 2.4
+ 2.800000000: 0.7 8 of 10: 0.7 at 2.8
+ 3.200000000: 0.8 9 of 10: 0.8 at 3.2
+ 3.600000000: 0.9 10 of 10: 0.9 at 3.6
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin-freq_grid-fsr.txt
--- a/test/expected/vamp-test-plugin-freq_grid-fsr.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin-freq_grid-fsr.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
-=== vamp-test-plugin:vamp-test-plugin-freq:grid-fsr
- 20.003990929: 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 1 of 10 at 0
- 20.003990929: 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 2 of 10 at 0.4
- 20.003990929: 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 3 of 10 at 0.8
- 20.003990929: 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 4 of 10 at 1.2
- 20.003990929: 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 5 of 10 at 1.6
- 20.003990929: 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 6 of 10 at 2
- 20.003990929: 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 7 of 10 at 2.4
- 20.003990929: 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 8 of 10 at 2.8
- 20.003990929: 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 9 of 10 at 3.2
- 20.003990929: 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 10 of 10 at 3.6
+=== vamp-test-plugin:vamp-test-plugin:grid-fsr
+ 0.000000000: 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 1 of 10 at 0
+ 0.400000000: 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 2 of 10 at 0.4
+ 0.800000000: 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 3 of 10 at 0.8
+ 1.200000000: 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 4 of 10 at 1.2
+ 1.600000000: 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 5 of 10 at 1.6
+ 2.000000000: 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 6 of 10 at 2
+ 2.400000000: 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 7 of 10 at 2.4
+ 2.800000000: 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 8 of 10 at 2.8
+ 3.200000000: 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 9 of 10 at 3.2
+ 3.600000000: 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 10 of 10 at 3.6
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin_curve-fsr-timed.txt
--- a/test/expected/vamp-test-plugin_curve-fsr-timed.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin_curve-fsr-timed.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
 === vamp-test-plugin:vamp-test-plugin:curve-fsr-timed
  0.000000000: 0 1 of 10: 0 at 0 snap to 0
  0.000000000: 0.1 2 of 10: 0.1 at 0 snap to 0
- 0.166666672: 0.2 3 of 10: 0.2 at 0.166 snap to 0
- 0.333333343: 0.3 4 of 10: 0.3 at 0.333 snap to 0.4
+ 0.000000000: 0.2 3 of 10: 0.2 at 0.166 snap to 0
+ 0.400000000: 0.3 4 of 10: 0.3 at 0.333 snap to 0.4
  2.000000000: 0.4 5 of 10: 0.4 at 2 snap to 2
  2.000000000: 0.5 6 of 10: 0.5 at 2 snap to 2
- 2.166666746: 0.6 7 of 10: 0.6 at 2.166 snap to 2
- 2.333333254: 0.7 8 of 10: 0.7 at 2.333 snap to 2.4
+ 2.000000000: 0.6 7 of 10: 0.6 at 2.166 snap to 2
+ 2.400000000: 0.7 8 of 10: 0.7 at 2.333 snap to 2.4
  4.000000000: 0.8 9 of 10: 0.8 at 4 snap to 4
  4.000000000: 0.9 10 of 10: 0.9 at 4 snap to 4
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin_curve-fsr.txt
--- a/test/expected/vamp-test-plugin_curve-fsr.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin_curve-fsr.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
 === vamp-test-plugin:vamp-test-plugin:curve-fsr
  0.000000000: 0 1 of 10: 0 at 0
- 0.023219954: 0.1 2 of 10: 0.1 at 0.4
- 0.046439909: 0.2 3 of 10: 0.2 at 0.8
- 0.069659863: 0.3 4 of 10: 0.3 at 1.2
- 0.092879818: 0.4 5 of 10: 0.4 at 1.6
- 20.015600907: 0.5 6 of 10: 0.5 at 2
- 20.015600907: 0.6 7 of 10: 0.6 at 2.4
- 20.015600907: 0.7 8 of 10: 0.7 at 2.8
- 20.015600907: 0.8 9 of 10: 0.8 at 3.2
- 20.015600907: 0.9 10 of 10: 0.9 at 3.6
+ 0.400000000: 0.1 2 of 10: 0.1 at 0.4
+ 0.800000000: 0.2 3 of 10: 0.2 at 0.8
+ 1.200000000: 0.3 4 of 10: 0.3 at 1.2
+ 1.600000000: 0.4 5 of 10: 0.4 at 1.6
+ 2.000000000: 0.5 6 of 10: 0.5 at 2
+ 2.400000000: 0.6 7 of 10: 0.6 at 2.4
+ 2.800000000: 0.7 8 of 10: 0.7 at 2.8
+ 3.200000000: 0.8 9 of 10: 0.8 at 3.2
+ 3.600000000: 0.9 10 of 10: 0.9 at 3.6
diff -r e506ffa4591b -r 88261e7c1db8 test/expected/vamp-test-plugin_grid-fsr.txt
--- a/test/expected/vamp-test-plugin_grid-fsr.txt	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/expected/vamp-test-plugin_grid-fsr.txt	Thu Aug 18 10:45:10 2016 +0100
@@ -1,11 +1,11 @@
 === vamp-test-plugin:vamp-test-plugin:grid-fsr
- 20.015600907: 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 1 of 10 at 0
- 20.015600907: 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 2 of 10 at 0.4
- 20.015600907: 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 3 of 10 at 0.8
- 20.015600907: 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 4 of 10 at 1.2
- 20.015600907: 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 5 of 10 at 1.6
- 20.015600907: 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 6 of 10 at 2
- 20.015600907: 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 7 of 10 at 2.4
- 20.015600907: 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 8 of 10 at 2.8
- 20.015600907: 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 9 of 10 at 3.2
- 20.015600907: 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 10 of 10 at 3.6
+ 0.000000000: 0.1 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 1 of 10 at 0
+ 0.400000000: 0.15 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 2 of 10 at 0.4
+ 0.800000000: 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 3 of 10 at 0.8
+ 1.200000000: 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 4 of 10 at 1.2
+ 1.600000000: 0.3 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 5 of 10 at 1.6
+ 2.000000000: 0.35 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 6 of 10 at 2
+ 2.400000000: 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 7 of 10 at 2.4
+ 2.800000000: 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 8 of 10 at 2.8
+ 3.200000000: 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 9 of 10 at 3.2
+ 3.600000000: 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 10 of 10 at 3.6
diff -r e506ffa4591b -r 88261e7c1db8 test/run-test-plugin-regression.sh
--- a/test/run-test-plugin-regression.sh	Wed Aug 17 14:01:39 2016 +0100
+++ b/test/run-test-plugin-regression.sh	Thu Aug 18 10:45:10 2016 +0100
@@ -7,7 +7,8 @@
 TEST_PLUGIN_DIR="$MYDIR/../../vamp-test-plugin"
 HOST_DIR="$MYDIR/../host"
 HOST="$HOST_DIR/vamp-simple-host"
-TEST_FILE="$MYDIR/20sec-silence.wav"
+#TEST_FILE="$MYDIR/20sec-silence.wav"
+TEST_FILE="/tmp/test.wav"
 
 mkdir -p "$MYDIR/obtained"
 mkdir -p "$MYDIR/failures"
diff -r e506ffa4591b -r 88261e7c1db8 test/testsignal.wav
Binary file test/testsignal.wav has changed