diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2018-06-02 13:21:34 -0700 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2018-06-02 13:21:34 -0700 |
| commit | ee54a86cb7092ce62ad7beaae9307df8fa1bb09c (patch) | |
| tree | d40084906144f5f97224db2ceb644a3e43119b00 | |
| parent | 76906fbe479a4f6319f79f5c7fd32745b293240e (diff) | |
| parent | 1db8afcf2265bf1d03eff89cd61db9fe9ff72064 (diff) | |
Merge branch 'new_directionality' of github.com:mariomulansky/PySpike into new_directionality
| -rw-r--r-- | pyspike/__init__.py | 6 | ||||
| -rw-r--r-- | setup.py | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 0250abc..3cf416f 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -34,6 +34,12 @@ from .spike_directionality import spike_directionality, \ spike_train_order_profile_multi, optimal_spike_train_order_from_matrix, \ optimal_spike_train_order, permutate_matrix +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, \ + optimal_spike_train_order, permutate_matrix + # define the __version__ following # http://stackoverflow.com/questions/17583443 from pkg_resources import get_distribution, DistributionNotFound @@ -100,7 +100,6 @@ train similarity', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', |