summaryrefslogtreecommitdiff
path: root/test/test_distance.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:09:57 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2014-10-10 17:09:57 +0200
commit7a8f12ab65ceea0211f6f24c26042768ef005302 (patch)
tree337274557c9947aae8adc1754e6857b5a6168e44 /test/test_distance.py
parenta769a03d089ac0c61e2155239a28665c9316e14a (diff)
fixed the examples
Diffstat (limited to 'test/test_distance.py')
-rw-r--r--test/test_distance.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test_distance.py b/test/test_distance.py
index 92b99ae..84d0af9 100644
--- a/test/test_distance.py
+++ b/test/test_distance.py
@@ -23,8 +23,8 @@ 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]
- t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0))
- t2 = spk.add_auxiliary_spikes(t2, (0.0,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)
@@ -39,8 +39,8 @@ 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]
- t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0))
- t2 = spk.add_auxiliary_spikes(t2, (0.0,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)
@@ -64,8 +64,8 @@ def test_spike():
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)
- t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0))
- t2 = spk.add_auxiliary_spikes(t2, (0.0,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)
@@ -84,8 +84,8 @@ def test_spike():
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)
- t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0))
- t2 = spk.add_auxiliary_spikes(t2, (0.0,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)