generic interface for spike distance/profile

spike_profile and spike_distance now have a generic interface that allows
to compute bi-variate and multi-variate results with the same function.

2 files changed, 31 insertions, 1 deletions

diff --git a/test/test_generic_interfaces.py b/test/test_generic_interfaces.py
index caa9ee4..ee87be4 100644
--- a/test/test_generic_interfaces.py
+++ b/test/test_generic_interfaces.py
@@ -23,7 +23,12 @@ class dist_from_prof:
         self.prof_func = prof_func
 
     def __call__(self, *args, **kwargs):
-        return self.prof_func(*args, **kwargs).avrg()
+        if "interval" in kwargs:
+            # forward interval arg into avrg function
+            interval = kwargs.pop("interval")
+            return self.prof_func(*args, **kwargs).avrg(interval=interval)
+        else:
+            return self.prof_func(*args, **kwargs).avrg()
 
 
 def check_func(dist_func):
@@ -50,6 +55,22 @@ def check_func(dist_func):
     isi123_ = dist_func(spike_trains, indices=[0, 1, 2])
     assert_equal(isi123, isi123_)
 
+    # run the same test with an additional interval parameter
+
+    isi12 = dist_func(t1, t2, interval=[0.0, 0.5])
+    isi12_ = dist_func([t1, t2], interval=[0.0, 0.5])
+    assert_equal(isi12, isi12_)
+
+    isi12_ = dist_func(spike_trains, indices=[0, 1], interval=[0.0, 0.5])
+    assert_equal(isi12, isi12_)
+
+    isi123 = dist_func(t1, t2, t3, interval=[0.0, 0.5])
+    isi123_ = dist_func([t1, t2, t3], interval=[0.0, 0.5])
+    assert_equal(isi123, isi123_)
+
+    isi123_ = dist_func(spike_trains, indices=[0, 1, 2], interval=[0.0, 0.5])
+    assert_equal(isi123, isi123_)
+
 
 def test_isi_profile():
     check_func(dist_from_prof(spk.isi_profile))
@@ -59,6 +80,14 @@ def test_isi_distance():
     check_func(spk.isi_distance)
 
 
+def test_spike_profile():
+    check_func(dist_from_prof(spk.spike_profile))
+
+
+def test_spike_distance():
+    check_func(spk.spike_distance)
+
+
 if __name__ == "__main__":
     test_isi_profile()
     test_isi_distance()
diff --git a/test/test_regression/test_regression_15.py b/test/test_regression/test_regression_15.py
index dcacae2..54adf23 100644
--- a/test/test_regression/test_regression_15.py
+++ b/test/test_regression/test_regression_15.py
@@ -20,6 +20,7 @@ import os
 TEST_PATH = os.path.dirname(os.path.realpath(__file__))
 TEST_DATA = os.path.join(TEST_PATH, "..", "SPIKE_Sync_Test.txt")
 
+
 def test_regression_15_isi():
     # load spike trains
     spike_trains = spk.load_spike_trains_from_txt(TEST_DATA, edges=[0, 4000])