summaryrefslogtreecommitdiff
path: root/pyspike/isi_distance.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-05-07 23:08:12 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2015-05-07 23:08:12 +0200
commita0262fc04e4b084f4dd270a75938d4ad029783d4 (patch)
tree09eea9b88d8a8e08ae035e36eb071979c4ce73ab /pyspike/isi_distance.py
parenta7df02c0dc064dbb0586a394bb74200c7d6d67df (diff)
performance improvements
use recursive approach to compute average profile for average multivariate distances, dont compute average multivariate profile, but average distances directly.
Diffstat (limited to 'pyspike/isi_distance.py')
-rw-r--r--pyspike/isi_distance.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pyspike/isi_distance.py b/pyspike/isi_distance.py
index aeab0df..21df561 100644
--- a/pyspike/isi_distance.py
+++ b/pyspike/isi_distance.py
@@ -3,7 +3,8 @@
# Distributed under the BSD License
from pyspike import PieceWiseConstFunc
-from pyspike.generic import _generic_profile_multi, _generic_distance_matrix
+from pyspike.generic import _generic_profile_multi, _generic_distance_multi, \
+ _generic_distance_matrix
############################################################
@@ -112,7 +113,8 @@ def isi_distance_multi(spike_trains, indices=None, interval=None):
:returns: The time-averaged multivariate ISI distance :math:`D_I`
:rtype: double
"""
- return isi_profile_multi(spike_trains, indices).avrg(interval)
+ return _generic_distance_multi(spike_trains, isi_distance, indices,
+ interval)
############################################################