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 /pyspike/__init__.py | |
| parent | 62f792fa52801234d4f9c33800a44b0308e9b8ab (diff) | |
added load_txt function, some restructuring
Diffstat (limited to 'pyspike/__init__.py')
| -rw-r--r-- | pyspike/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 21005e9..2703f65 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -1,6 +1,7 @@ __all__ = ["function", "distances", "spikes"] from function import PieceWiseConstFunc, PieceWiseLinFunc -from distances import add_auxiliary_spikes, isi_distance, spike_distance, \ +from distances import isi_distance, spike_distance, \ isi_distance_multi, spike_distance_multi, isi_distance_matrix -from spikes import spike_train_from_string, merge_spike_trains +from spikes import add_auxiliary_spikes, load_spike_trains_from_txt, \ + spike_train_from_string, merge_spike_trains |