diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-15 17:31:55 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2014-09-15 17:31:55 +0200 |
commit | 5ea0fc218bb3bb30b1c40dd20e2e35a8bd11151c (patch) | |
tree | e4e01ee2d7f8698b4dcc2b9d6041d37963474e41 /pyspike/distances.py | |
parent | f9529c78538882879a07cb67e342eade8d2153ab (diff) |
+merge_spike_trains
Diffstat (limited to 'pyspike/distances.py')
-rw-r--r-- | pyspike/distances.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pyspike/distances.py b/pyspike/distances.py index d9790dc..7044a52 100644 --- a/pyspike/distances.py +++ b/pyspike/distances.py @@ -9,16 +9,6 @@ import numpy as np from pyspike import PieceWiseConstFunc -def spike_train_from_string(s, sep=' '): - """ Converts a string of times into a SpikeTrain object. - Params: - - s: the string with (ordered) spike times - - sep: The separator between the time numbers. - Returns: - - array of spike times - """ - return np.fromstring(s, sep=sep) - def isi_distance(spikes1, spikes2, T_end, T_start=0.0): """ Computes the instantaneous isi-distance S_isi (t) of the two given spike trains. |