+ add_auxiliary_spikes function incl test

1 files changed, 31 insertions, 12 deletions

diff --git a/test/test_distance.py b/test/test_distance.py
index 17ca14a..35bdf85 100644
--- a/test/test_distance.py
+++ b/test/test_distance.py
@@ -11,6 +11,13 @@ from numpy.testing import assert_equal, assert_array_almost_equal
 
 import pyspike as spk
 
+def test_auxiliary_spikes():
+    t = np.array([0.2, 0.4, 0.6, 0.7])
+    t_aux = spk.add_auxiliary_spikes(t, T_end=1.0, T_start=0.1)
+    assert_equal(t_aux, [0.1, 0.2, 0.4, 0.6, 0.7, 1.0])
+    t_aux = spk.add_auxiliary_spikes(t_aux, 1.0)
+    assert_equal(t_aux, [0.0, 0.1, 0.2, 0.4, 0.6, 0.7, 1.0])
+
 def test_isi():
     # generate two spike trains:
     t1 = np.array([0.2, 0.4, 0.6, 0.7])
@@ -21,7 +28,11 @@ def test_isi():
     expected_isi = [-0.1/0.3, -0.1/0.3, 0.05/0.2, 0.05/0.2, -0.15/0.35, 
                     -0.25/0.35, -0.05/0.35, 0.2/0.3, 0.25/0.3, 0.25/0.3]
     
-    f = spk.isi_distance(t1, t2, 1.0)
+    t1 = spk.add_auxiliary_spikes(t1, 1.0)
+    t2 = spk.add_auxiliary_spikes(t2, 1.0)
+    f = spk.isi_distance(t1, t2)
+
+    print("ISI: ", f.y)
 
     assert_equal(f.x, expected_times)
     assert_array_almost_equal(f.y, expected_isi, decimal=14)
@@ -33,7 +44,9 @@ def test_isi():
     expected_times = [0.0,0.1,0.2,0.4,0.5,0.6,1.0]
     expected_isi = [0.1/0.2, -0.1/0.3, -0.1/0.3, 0.1/0.2, 0.1/0.2, -0.0/0.5]
 
-    f = spk.isi_distance(t1, t2, 1.0)
+    t1 = spk.add_auxiliary_spikes(t1, 1.0)
+    t2 = spk.add_auxiliary_spikes(t2, 1.0)
+    f = spk.isi_distance(t1, t2)
 
     assert_equal(f.x, expected_times)
     assert_array_almost_equal(f.y, expected_isi, decimal=14)
@@ -46,16 +59,19 @@ def test_spike():
 
     # pen&paper calculation of the spike distance
     expected_times = [0.0,0.2,0.3,0.4,0.45,0.6,0.7,0.8,0.9,0.95,1.0]
-    s1 = np.array([0.0, 0.1, (0.1*0.1+0.05*0.1)/0.2, 0.05, (0.05*0.15 * 2)/0.2,
-          0.15, 0.1, 0.1*0.2/0.3, 0.1**2/0.3, 0.1*0.05/0.3, 0.0])
-    s2 = np.array([0.0, 0.1*0.2/0.3, 0.1, (0.1*0.05 * 2)/.15, 0.05, 
-          (0.05*0.2+0.1*0.15)/0.35, (0.05*0.1+0.1*0.25)/0.35, 0.1,0.1,0.05,0.0])
+    s1 = np.array([0.1, 0.1, (0.1*0.1+0.05*0.1)/0.2, 0.05, (0.05*0.15 * 2)/0.2,
+                   0.15, 0.1, 0.1*0.2/0.3, 0.1**2/0.3, 0.1*0.05/0.3, 0.1])
+    s2 = np.array([0.1, 0.1*0.2/0.3, 0.1, (0.1*0.05 * 2)/.15, 0.05, 
+                   (0.05*0.2+0.1*0.15)/0.35, (0.05*0.1+0.1*0.25)/0.35, 
+                   0.1, 0.1, 0.05, 0.05])
     isi1 = np.array([0.2, 0.2, 0.2, 0.2, 0.2, 0.1, 0.3, 0.3, 0.3, 0.3])
     isi2 = np.array([0.3, 0.3, 0.15, 0.15, 0.35, 0.35, 0.35, 0.1, 0.05, 0.05])
     expected_y1 = (s1[:-1]*isi2+s2[:-1]*isi1) / (0.5*(isi1+isi2)**2)
     expected_y2 = (s1[1:]*isi2+s2[1:]*isi1) / (0.5*(isi1+isi2)**2)
 
-    f = spk.spike_distance(t1, t2, 1.0)
+    t1 = spk.add_auxiliary_spikes(t1, 1.0)
+    t2 = spk.add_auxiliary_spikes(t2, 1.0)
+    f = spk.spike_distance(t1, t2)
 
     assert_equal(f.x, expected_times)
     assert_array_almost_equal(f.y1, expected_y1, decimal=14)
@@ -66,20 +82,23 @@ def test_spike():
     t2 = np.array([0.1,0.4,0.5,0.6])
 
     expected_times = [0.0,0.1,0.2,0.4,0.5,0.6,1.0]
-    s1 = np.array([0.0, 0.1*0.1/0.2, 0.1, 0.0, 0.0, 0.0, 0.0])
-    s2 = np.array([0.0, 0.1, 0.1*0.2/0.3, 0.0, 0.1, 0.0, 0.0])
+    s1 = np.array([0.1, 0.1*0.1/0.2, 0.1, 0.0, 0.0, 0.0, 0.0])
+    s2 = np.array([0.1*0.1/0.3, 0.1, 0.1*0.2/0.3, 0.0, 0.1, 0.0, 0.0])
     isi1 = np.array([0.2, 0.2, 0.2, 0.2, 0.2, 0.4])
-    isi2 = np.array([0.1, 0.3, 0.3, 0.1, 0.1, 0.4])
+    isi2 = np.array([0.3, 0.3, 0.3, 0.1, 0.1, 0.4])
     expected_y1 = (s1[:-1]*isi2+s2[:-1]*isi1) / (0.5*(isi1+isi2)**2)
     expected_y2 = (s1[1:]*isi2+s2[1:]*isi1) / (0.5*(isi1+isi2)**2)
     
-    f = spk.spike_distance(t1, t2, 1.0)
+    t1 = spk.add_auxiliary_spikes(t1, 1.0)
+    t2 = spk.add_auxiliary_spikes(t2, 1.0)
+    f = spk.spike_distance(t1, t2)
 
     assert_equal(f.x, expected_times)
     assert_array_almost_equal(f.y1, expected_y1, decimal=14)
     assert_array_almost_equal(f.y2, expected_y2, decimal=14)
 
 
-if __name__ == "main":
+if __name__ == "__main__":
+    test_auxiliary_spikes()
     test_isi()
     test_spike()