summaryrefslogtreecommitdiff
path: root/pyspike/spikes.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2014-09-15 17:31:55 +0200
committerMario Mulansky <mario.mulansky@gmx.net>2014-09-15 17:31:55 +0200
commit5ea0fc218bb3bb30b1c40dd20e2e35a8bd11151c (patch)
treee4e01ee2d7f8698b4dcc2b9d6041d37963474e41 /pyspike/spikes.py
parentf9529c78538882879a07cb67e342eade8d2153ab (diff)
+merge_spike_trains
Diffstat (limited to 'pyspike/spikes.py')
-rw-r--r--pyspike/spikes.py26
1 files changed, 25 insertions, 1 deletions
diff --git a/pyspike/spikes.py b/pyspike/spikes.py
index 42b6501..66ef554 100644
--- a/pyspike/spikes.py
+++ b/pyspike/spikes.py
@@ -8,7 +8,7 @@ Copyright 2014, Mario Mulansky <mario.mulansky@gmx.net>
import numpy as np
def spike_train_from_string(s, sep=' '):
- """ Converts a string of times into a SpikeTrain object.
+ """ Converts a string of times into an array of spike times.
Params:
- s: the string with (ordered) spike times
- sep: The separator between the time numbers.
@@ -16,3 +16,27 @@ def spike_train_from_string(s, sep=' '):
- array of spike times
"""
return np.fromstring(s, sep=sep)
+
+
+def merge_spike_trains( spike_trains ):
+ """ Merges a number of spike trains into a single spike train.
+ Params:
+ - spike_trains: list of arrays of spike times
+ Returns:
+ - array with the merged spike times
+ """
+ # get the lengths of the spike trains
+ lens = np.array([len(st) for st in spike_trains])
+ merged_spikes = np.empty(np.sum(lens))
+ index = 0
+ indices = np.zeros_like(lens)
+ vals = [spike_trains[i][indices[i]] for i in xrange(len(indices))]
+ while len(indices) > 0:
+ i = np.argmin(vals)
+ merged_spikes[index] = vals[i]
+ index += 1
+ indices[i] += 1
+ if indices[i] >= lens[i]:
+ indices = np.delete(indices, i)
+ vals = [spike_trains[i][indices[i]] for i in xrange(len(indices))]
+ return merged_spikes