diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-11 15:54:19 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-11 15:54:19 +0200 |
| commit | b6521869cad89eae119391557bfa57e818dc9894 (patch) | |
| tree | f27c04399919b9d770af68393fa0584689866557 /pyspike | |
| parent | 017893e782d1747e1f031131077a40a48f882e86 (diff) | |
treatment of empty spike trains in spike distance
Diffstat (limited to 'pyspike')
| -rw-r--r-- | pyspike/spike_distance.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pyspike/spike_distance.py b/pyspike/spike_distance.py index d727fa2..ac2d260 100644 --- a/pyspike/spike_distance.py +++ b/pyspike/spike_distance.py @@ -41,10 +41,11 @@ Falling back to slow python backend.") from cython.python_backend import spike_distance_python \ as spike_profile_impl - times, y_starts, y_ends = spike_profile_impl(spike_train1.spikes, - spike_train2.spikes, - spike_train1.t_start, - spike_train1.t_end) + times, y_starts, y_ends = spike_profile_impl( + spike_train1.get_spikes_non_empty(), + spike_train2.get_spikes_non_empty(), + spike_train1.t_start, spike_train1.t_end) + return PieceWiseLinFunc(times, y_starts, y_ends) @@ -74,8 +75,8 @@ def spike_distance(spike_train1, spike_train2, interval=None): try: from cython.cython_distances import spike_distance_cython \ as spike_distance_impl - return spike_distance_impl(spike_train1.spikes, - spike_train2.spikes, + return spike_distance_impl(spike_train1.get_spikes_non_empty(), + spike_train2.get_spikes_non_empty(), spike_train1.t_start, spike_train1.t_end) except ImportError: |