diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-16 14:50:26 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-10-16 14:50:26 +0200 |
commit | 5970a9cfdbecc1af232b7ffe485bdc057591a2b8 (patch) | |
tree | 4ec6c23cd624bb33b0e87821541689874e659983 /test/test_spikes.py | |
parent | d869d4d822c651ea3d094eaf17ba7732bf91136f (diff) |
added spike_matrix, refactoring dist matrix functs
Diffstat (limited to 'test/test_spikes.py')
-rw-r--r-- | test/test_spikes.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_spikes.py b/test/test_spikes.py index d650d5d..b12099e 100644 --- a/test/test_spikes.py +++ b/test/test_spikes.py @@ -66,6 +66,7 @@ def test_merge_spike_trains(): # first load the data 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()) |