comparison test/test_collect.py @ 117:2370b942cd32

Docs, make collect() return a dict so it can be more easily tested for shape, and rationalise some function naming etc

     # start at 1, not 0 so that all elts are non-zero
     return np.arange(n) + 1    
 
 def test_collect_runs_at_all():
     buf = input_data(blocksize * 10)
-    step, results = vamp.collect(buf, rate, plugin_key, "input-timestamp")
+    rdict = vamp.collect(buf, rate, plugin_key, "input-timestamp")
+    step, results = rdict["vector"]
     assert results != []
 
 ##!!! add test for default output
     
 def test_collect_one_sample_per_step():
     buf = input_data(blocksize * 10)
-    step, results = vamp.collect(buf, rate, plugin_key, "input-timestamp")
+    rdict = vamp.collect(buf, rate, plugin_key, "input-timestamp")
+    step, results = rdict["vector"]
     assert abs(float(step) - (1024.0 / rate)) < eps
     assert len(results) == 10
     for i in range(len(results)):
         # The timestamp should be the frame number of the first frame in the
         # input buffer

         actual = results[i]
         assert actual == expected
 
 def test_collect_fixed_sample_rate():
     buf = input_data(blocksize * 10)
-    step, results = vamp.collect(buf, rate, plugin_key, "curve-fsr")
+    rdict = vamp.collect(buf, rate, plugin_key, "curve-fsr")
+    step, results = rdict["vector"]
     assert abs(float(step) - 0.4) < eps
     assert len(results) == 10
     for i in range(len(results)):
         assert abs(results[i] - i * 0.1) < eps
 
 def test_collect_fixed_sample_rate_2():
     buf = input_data(blocksize * 10)
-    step, results = vamp.collect(buf, rate, plugin_key, "curve-fsr-timed")
+    rdict = vamp.collect(buf, rate, plugin_key, "curve-fsr-timed")
+    step, results = rdict["vector"]
     assert abs(float(step) - 0.4) < eps
     assert len(results) == 10
     for i in range(len(results)):
         assert abs(results[i] - i * 0.1) < eps
         
 def test_collect_variable_sample_rate():
     buf = input_data(blocksize * 10)
-    results = vamp.collect(buf, rate, plugin_key, "curve-vsr")
+    rdict = vamp.collect(buf, rate, plugin_key, "curve-vsr")
+    results = rdict["list"]
     assert len(results) == 10
     i = 0
     for r in results:
         assert r["timestamp"] == vamp.vampyhost.RealTime('seconds', i * 0.75)
         assert abs(r["values"][0] - i * 0.1) < eps
         i = i + 1
 
 def test_collect_grid_one_sample_per_step():
     buf = input_data(blocksize * 10)
-    step, results = vamp.collect(buf, rate, plugin_key, "grid-oss")
+    rdict = vamp.collect(buf, rate, plugin_key, "grid-oss")
+    step, results = rdict["matrix"]
     assert abs(float(step) - (1024.0 / rate)) < eps
     assert len(results) == 10
     for i in range(len(results)):
         expected = np.array([ (j + i + 2.0) / 30.0 for j in range(0, 10) ])
         assert (abs(results[i] - expected) < eps).all()