diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-07 23:08:12 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-05-07 23:08:12 +0200 |
commit | a0262fc04e4b084f4dd270a75938d4ad029783d4 (patch) | |
tree | 09eea9b88d8a8e08ae035e36eb071979c4ce73ab /pyspike/spike_distance.py | |
parent | a7df02c0dc064dbb0586a394bb74200c7d6d67df (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/spike_distance.py')
-rw-r--r-- | pyspike/spike_distance.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pyspike/spike_distance.py b/pyspike/spike_distance.py index cc620d4..75b3b0e 100644 --- a/pyspike/spike_distance.py +++ b/pyspike/spike_distance.py @@ -3,7 +3,8 @@ # Distributed under the BSD License from pyspike import PieceWiseLinFunc -from pyspike.generic import _generic_profile_multi, _generic_distance_matrix +from pyspike.generic import _generic_profile_multi, _generic_distance_multi, \ + _generic_distance_matrix ############################################################ @@ -117,7 +118,8 @@ def spike_distance_multi(spike_trains, indices=None, interval=None): :returns: The averaged multi-variate spike distance :math:`D_S`. :rtype: double """ - return spike_profile_multi(spike_trains, indices).avrg(interval) + return _generic_distance_multi(spike_trains, spike_distance, indices, + interval) ############################################################ |