diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-16 12:41:43 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-16 12:41:43 +0200 |
| commit | 4249dd363e992fe1178c9d76db3f74c5005afb0a (patch) | |
| tree | 560136e1e0aaa62227ec583f16e09ebec7e3c850 /test | |
| parent | a32c32e968368589dc9ca7baf08636a2ce25d4cc (diff) | |
changed function names distance -> profiles,
added distance functions
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_distance.py | 18 | ||||
| -rw-r--r-- | test/test_spikes.py | 7 |
2 files changed, 12 insertions, 13 deletions
diff --git a/test/test_distance.py b/test/test_distance.py index 0695701..81ffe09 100644 --- a/test/test_distance.py +++ b/test/test_distance.py @@ -28,7 +28,7 @@ def test_isi(): t1 = spk.add_auxiliary_spikes(t1, 1.0) t2 = spk.add_auxiliary_spikes(t2, 1.0) - f = spk.isi_distance(t1, t2) + f = spk.isi_profile(t1, t2) # print("ISI: ", f.y) @@ -44,7 +44,7 @@ def test_isi(): t1 = spk.add_auxiliary_spikes(t1, 1.0) t2 = spk.add_auxiliary_spikes(t2, 1.0) - f = spk.isi_distance(t1, t2) + f = spk.isi_profile(t1, t2) assert_equal(f.x, expected_times) assert_array_almost_equal(f.y, expected_isi, decimal=14) @@ -69,7 +69,7 @@ def test_spike(): t1 = spk.add_auxiliary_spikes(t1, 1.0) t2 = spk.add_auxiliary_spikes(t2, 1.0) - f = spk.spike_distance(t1, t2) + f = spk.spike_profile(t1, t2) assert_equal(f.x, expected_times) assert_array_almost_equal(f.y1, expected_y1, decimal=14) @@ -89,7 +89,7 @@ def test_spike(): t1 = spk.add_auxiliary_spikes(t1, 1.0) t2 = spk.add_auxiliary_spikes(t2, 1.0) - f = spk.spike_distance(t1, t2) + f = spk.spike_profile(t1, t2) assert_equal(f.x, expected_times) assert_array_almost_equal(f.y1, expected_y1, decimal=14) @@ -131,23 +131,23 @@ def check_multi_distance(dist_func, dist_func_multi): def test_multi_isi(): - check_multi_distance(spk.isi_distance, spk.isi_distance_multi) + check_multi_distance(spk.isi_profile, spk.isi_profile_multi) def test_multi_spike(): - check_multi_distance(spk.spike_distance, spk.spike_distance_multi) + check_multi_distance(spk.spike_profile, spk.spike_profile_multi) def test_regression_spiky(): - spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", + spike_trains = spk.load_spike_trains_from_txt("test/PySpike_testdata.txt", (0.0, 4000.0)) - isi_profile = spk.isi_distance_multi(spike_trains) + isi_profile = spk.isi_profile_multi(spike_trains) isi_dist = isi_profile.avrg() print(isi_dist) # get the full precision from SPIKY # assert_equal(isi_dist, 0.1832) - spike_profile = spk.spike_distance_multi(spike_trains) + spike_profile = spk.spike_profile_multi(spike_trains) spike_dist = spike_profile.avrg() print(spike_dist) # get the full precision from SPIKY diff --git a/test/test_spikes.py b/test/test_spikes.py index bf914c0..d650d5d 100644 --- a/test/test_spikes.py +++ b/test/test_spikes.py @@ -23,7 +23,7 @@ def test_auxiliary_spikes(): def test_load_from_txt(): - spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", + spike_trains = spk.load_spike_trains_from_txt("test/PySpike_testdata.txt", time_interval=(0, 4000)) assert len(spike_trains) == 40 @@ -39,7 +39,7 @@ def test_load_from_txt(): assert spike_train[-1] == 4000 # load without adding auxiliary spikes - spike_trains2 = spk.load_spike_trains_from_txt("PySpike_testdata.txt", + spike_trains2 = spk.load_spike_trains_from_txt("test/PySpike_testdata.txt", time_interval=None) assert len(spike_trains2) == 40 # check auxiliary spikes @@ -64,9 +64,8 @@ def check_merged_spikes(merged_spikes, spike_trains): def test_merge_spike_trains(): # first load the data - spike_trains = spk.load_spike_trains_from_txt("PySpike_testdata.txt", + spike_trains = spk.load_spike_trains_from_txt("test/PySpike_testdata.txt", time_interval=(0, 4000)) - spikes = spk.merge_spike_trains([spike_trains[0], spike_trains[1]]) # test if result is sorted assert((spikes == np.sort(spikes)).all()) |