diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-10 17:04:04 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-10 17:04:04 +0200 |
| commit | a769a03d089ac0c61e2155239a28665c9316e14a (patch) | |
| tree | 766347541743aab1baeb07e9d75d008981c553d6 /test/test_distance.py | |
| parent | 62f792fa52801234d4f9c33800a44b0308e9b8ab (diff) | |
added load_txt function, some restructuring
Diffstat (limited to 'test/test_distance.py')
| -rw-r--r-- | test/test_distance.py | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/test/test_distance.py b/test/test_distance.py index c43f0b3..92b99ae 100644 --- a/test/test_distance.py +++ b/test/test_distance.py @@ -13,14 +13,6 @@ 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]) @@ -31,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, 1.0) - t2 = spk.add_auxiliary_spikes(t2, 1.0) + t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0)) + t2 = spk.add_auxiliary_spikes(t2, (0.0,1.0)) f = spk.isi_distance(t1, t2) # print("ISI: ", f.y) @@ -47,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, 1.0) - t2 = spk.add_auxiliary_spikes(t2, 1.0) + t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0)) + t2 = spk.add_auxiliary_spikes(t2, (0.0,1.0)) f = spk.isi_distance(t1, t2) assert_equal(f.x, expected_times) @@ -72,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, 1.0) - t2 = spk.add_auxiliary_spikes(t2, 1.0) + t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0)) + t2 = spk.add_auxiliary_spikes(t2, (0.0,1.0)) f = spk.spike_distance(t1, t2) assert_equal(f.x, expected_times) @@ -92,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, 1.0) - t2 = spk.add_auxiliary_spikes(t2, 1.0) + t1 = spk.add_auxiliary_spikes(t1, (0.0,1.0)) + t2 = spk.add_auxiliary_spikes(t2, (0.0,1.0)) f = spk.spike_distance(t1, t2) assert_equal(f.x, expected_times) |