diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-06-18 16:32:39 -0700 |
commit | a63839708d6574567bcd518a822a9f10629ed80b (patch) | |
tree | 02c28e0856b62c08fd4d3622ee68d145d8eee6eb /test/test_regression/test_regression_15.py | |
parent | d9e2125dcc76693056ab04264add29227f398f4f (diff) | |
parent | 4691d0e77a024fbc73d1098ee557d65f8f2ddc89 (diff) |
Merge branch 'import_time_series' into develop
Conflicts:
pyspike/__init__.py
resolved
Diffstat (limited to 'test/test_regression/test_regression_15.py')
-rw-r--r-- | test/test_regression/test_regression_15.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/test_regression/test_regression_15.py b/test/test_regression/test_regression_15.py index dcacae2..54adf23 100644 --- a/test/test_regression/test_regression_15.py +++ b/test/test_regression/test_regression_15.py @@ -20,6 +20,7 @@ import os TEST_PATH = os.path.dirname(os.path.realpath(__file__)) TEST_DATA = os.path.join(TEST_PATH, "..", "SPIKE_Sync_Test.txt") + def test_regression_15_isi(): # load spike trains spike_trains = spk.load_spike_trains_from_txt(TEST_DATA, edges=[0, 4000]) |