diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-19 17:58:04 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-19 17:58:04 +0100 |
commit | 66968eedd276eb5d661b25d92775203546a3d646 (patch) | |
tree | 82abff1e9d67cc1672cedb44c73ee79eb29ccbc8 /pyspike/distances.py | |
parent | e0a3b5468364342d4468e07029e4daf2cacfd6b9 (diff) |
renamed IntervalSequence -> DiscreteFunction, cython implementation of add
Diffstat (limited to 'pyspike/distances.py')
-rw-r--r-- | pyspike/distances.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyspike/distances.py b/pyspike/distances.py index 8bde724..0f0efa9 100644 --- a/pyspike/distances.py +++ b/pyspike/distances.py @@ -11,7 +11,7 @@ import numpy as np import threading from functools import partial -from pyspike import PieceWiseConstFunc, PieceWiseLinFunc, MultipleValueSequence +from pyspike import PieceWiseConstFunc, PieceWiseLinFunc, DiscreteFunction ############################################################ @@ -148,7 +148,7 @@ Falling back to slow python backend.") times, coincidences, multiplicity = coincidence_impl(spikes1, spikes2) - return MultipleValueSequence(times, coincidences, multiplicity) + return DiscreteFunction(times, coincidences, multiplicity) ############################################################ @@ -328,7 +328,7 @@ def spike_sync_profile_multi(spike_trains, indices=None): if None all given spike trains are used (default=None) :type indices: list or None :returns: The averaged spike profile :math:`<S_{ss}>(t)` - :rtype: :class:`pyspike.function.PieceWiseConstFunc` + :rtype: :class:`pyspike.function.DiscreteFunction` """ prof_func = partial(spike_sync_profile) |