diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2016-03-29 12:35:51 +0200 |
| commit | ad29154d8c152996d16c012dcc5798c5f1957aed (patch) | |
| tree | f01575082a649061362178d4a9870cb5fe2c33f6 /pyspike/__init__.py | |
| parent | 1fa8493ce15af8cd4c057eece155f1557fc241ea (diff) | |
| parent | c17cc8602414cec883c412008a4300b2c7ac7f80 (diff) | |
Merge branch 'master' into new_directionality
Conflicts:
pyspike/__init__.py
pyspike/cython/cython_directionality.pyx
pyspike/cython/directionality_python_backend.py
pyspike/spike_directionality.py
setup.py
Diffstat (limited to 'pyspike/__init__.py')
| -rw-r--r-- | pyspike/__init__.py | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 4c1e47e..7f578b0 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -4,28 +4,30 @@ Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> Distributed under the BSD License """ +from __future__ import absolute_import + __all__ = ["isi_distance", "spike_distance", "spike_sync", "psth", "spikes", "spike_directionality", "SpikeTrain", "PieceWiseConstFunc", "PieceWiseLinFunc", "DiscreteFunc"] -from PieceWiseConstFunc import PieceWiseConstFunc -from PieceWiseLinFunc import PieceWiseLinFunc -from DiscreteFunc import DiscreteFunc -from SpikeTrain import SpikeTrain +from .PieceWiseConstFunc import PieceWiseConstFunc +from .PieceWiseLinFunc import PieceWiseLinFunc +from .DiscreteFunc import DiscreteFunc +from .SpikeTrain import SpikeTrain -from isi_distance import isi_profile, isi_distance, isi_profile_multi,\ +from .isi_distance import isi_profile, isi_distance, isi_profile_multi,\ isi_distance_multi, isi_distance_matrix -from spike_distance import spike_profile, spike_distance, spike_profile_multi,\ +from .spike_distance import spike_profile, spike_distance, spike_profile_multi,\ spike_distance_multi, spike_distance_matrix -from spike_sync import spike_sync_profile, spike_sync,\ +from .spike_sync import spike_sync_profile, spike_sync,\ spike_sync_profile_multi, spike_sync_multi, spike_sync_matrix,\ filter_by_spike_sync -from psth import psth +from .psth import psth -from spikes import load_spike_trains_from_txt, spike_train_from_string, \ +from .spikes import load_spike_trains_from_txt, spike_train_from_string, \ merge_spike_trains, generate_poisson_spikes -from spike_directionality import spike_directionality, \ +from .spike_directionality import spike_directionality, \ spike_directionality_profiles, spike_directionality_matrix, \ spike_train_order_profile, spike_train_order, \ spike_train_order_profile_multi, optimal_spike_train_order_from_matrix, \ |