diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-08-17 11:57:53 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-08-17 11:57:53 +0200 |
| commit | be74318a2b269ec0c1e16981e7286679746f1a49 (patch) | |
| tree | a892e5d4f63059cceeda1d1bae29472094a47745 /pyspike | |
| parent | 5731dad11d6d7129864fa6273d780000b34fd8a9 (diff) | |
fix #15
add test case and fix for Issue #15
closes #15
Diffstat (limited to 'pyspike')
| -rw-r--r-- | pyspike/generic.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyspike/generic.py b/pyspike/generic.py index 515cbf4..904c3c2 100644 --- a/pyspike/generic.py +++ b/pyspike/generic.py @@ -137,12 +137,13 @@ def _generic_distance_matrix(spike_trains, dist_function, assert (indices < len(spike_trains)).all() and (indices >= 0).all(), \ "Invalid index list." # generate a list of possible index pairs - pairs = [(indices[i], j) for i in range(len(indices)) - for j in indices[i+1:]] + pairs = [(i, j) for i in xrange(len(indices)) + for j in xrange(i+1, len(indices))] distance_matrix = np.zeros((len(indices), len(indices))) for i, j in pairs: - d = dist_function(spike_trains[i], spike_trains[j], interval) + d = dist_function(spike_trains[indices[i]], spike_trains[indices[j]], + interval) distance_matrix[i, j] = d distance_matrix[j, i] = d return distance_matrix |