changeset 111:4f590fc46ace

Update tests

--- a/native/PyPluginObject.cpp	Wed Jun 17 10:50:42 2015 +0100
+++ b/native/PyPluginObject.cpp	Wed Jun 17 11:04:15 2015 +0100
@@ -243,7 +243,7 @@
     PyDict_SetItemString
         (outdict, "hasDuration", desc.hasDuration ? Py_True : Py_False);
     PyDict_SetItemString
-        (outdict, "outputIndex", PyLong_FromLong(ix));
+        (outdict, "output_index", PyLong_FromLong(ix));
     return outdict;
 }
 

--- a/test/test_plugin_metadata.py	Wed Jun 17 10:50:42 2015 +0100
+++ b/test/test_plugin_metadata.py	Wed Jun 17 11:04:15 2015 +0100
@@ -33,7 +33,7 @@
 def test_get_output_by_id():
     plug = vh.load_plugin(plugin_key, rate, vh.ADAPT_NONE)
     out = plug.get_output("input-summary")
-    assert "sample_type" in out
+    assert "sampleType" in out
     assert out["output_index"] == 8
     try:
         out = plug.get_output("chops")
@@ -49,7 +49,7 @@
 def test_get_output_by_index():
     plug = vh.load_plugin(plugin_key, rate, vh.ADAPT_NONE)
     out = plug.get_output(0)
-    assert "sample_type" in out
+    assert "sampleType" in out
     assert out["identifier"] == "instants"
     assert out["output_index"] == 0
     try:

--- a/vamp/collect.py	Wed Jun 17 10:50:42 2015 +0100
+++ b/vamp/collect.py	Wed Jun 17 11:04:15 2015 +0100
@@ -8,23 +8,23 @@
 import numpy as np
 
 def get_feature_step_time(sample_rate, step_size, output_desc):
-    if output_desc["sample_type"] == vampyhost.ONE_SAMPLE_PER_STEP:
+    if output_desc["sampleType"] == vampyhost.ONE_SAMPLE_PER_STEP:
         return vampyhost.frame_to_realtime(step_size, sample_rate)
-    elif output_desc["sample_type"] == vampyhost.FIXED_SAMPLE_RATE:
-        return vampyhost.RealTime('seconds', 1.0 / output_desc["sample_rate"])
+    elif output_desc["sampleType"] == vampyhost.FIXED_SAMPLE_RATE:
+        return vampyhost.RealTime('seconds', 1.0 / output_desc["sampleRate"])
     else:
         return 1
 
 def timestamp_features(sample_rate, step_size, output_desc, features):
     n = -1
-    if output_desc["sample_type"] == vampyhost.ONE_SAMPLE_PER_STEP:
+    if output_desc["sampleType"] == vampyhost.ONE_SAMPLE_PER_STEP:
         for f in features:
             n = n + 1
             t = vampyhost.frame_to_realtime(n * step_size, sample_rate)
             f["timestamp"] = t
             yield f
-    elif output_desc["sample_type"] == vampyhost.FIXED_SAMPLE_RATE:
-        output_rate = output_desc["sample_rate"]
+    elif output_desc["sampleType"] == vampyhost.FIXED_SAMPLE_RATE:
+        output_rate = output_desc["sampleRate"]
         for f in features:
             if "has_timestamp" in f:
                 n = int(f["timestamp"].to_float() * output_rate + 0.5)
@@ -48,15 +48,15 @@
         yield s
 
 def deduce_shape(output_desc):
-    if output_desc["has_duration"]:
+    if output_desc["hasDuration"]:
         return "individual"
-    if output_desc["sample_type"] == vampyhost.VARIABLE_SAMPLE_RATE:
+    if output_desc["sampleType"] == vampyhost.VARIABLE_SAMPLE_RATE:
         return "individual"
-    if not output_desc["has_fixed_bin_count"]:
+    if not output_desc["hasFixedBinCount"]:
         return "individual"
-    if output_desc["bin_count"] == 0:
+    if output_desc["binCount"] == 0:
         return "individual"
-    if output_desc["bin_count"] == 1:
+    if output_desc["binCount"] == 1:
         return "vector"
     return "matrix"