comparison test/test_collect.py @ 94:c3318a95625b

Return step as well

     # 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)
-    results = list(vamp.collect(buf, rate, plugin_key, "input-timestamp"))
+    step, results = vamp.collect(buf, rate, plugin_key, "input-timestamp")
     assert results != []
 
 def test_collect_one_sample_per_step():
     buf = input_data(blocksize * 10)
-    results = list(vamp.collect(buf, rate, plugin_key, "input-timestamp"))
+    step, results = vamp.collect(buf, rate, plugin_key, "input-timestamp")
+    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
         expected = i * blocksize
         actual = results[i]
         assert actual == expected
 
 def test_collect_fixed_sample_rate():
     buf = input_data(blocksize * 10)
-    results = list(vamp.collect(buf, rate, plugin_key, "curve-fsr"))
+    step, results = vamp.collect(buf, rate, plugin_key, "curve-fsr")
+    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)
-    results = list(vamp.collect(buf, rate, plugin_key, "curve-fsr-timed"))
+    step, results = vamp.collect(buf, rate, plugin_key, "curve-fsr-timed")
+    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 = list(vamp.collect(buf, rate, plugin_key, "curve-vsr"))
+    results = vamp.collect(buf, rate, plugin_key, "curve-vsr")
     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