diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-22 16:08:23 +0100 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-22 16:08:23 +0100 |
| commit | b6b5ccae81d60b5ffd1bcea814432cad6833e6f0 (patch) | |
| tree | 50cfd3058986205183ed5e530945e7e638245554 | |
| parent | 0074a6ae1ad8de73b9521aafa5ba5e6064779e3e (diff) | |
| parent | 4724eb755354458e8b0730ceecb52a1a9c1c7e52 (diff) | |
Merge branch 'master' of https://github.com/richardtomsett/PySpike into richardtomsett-master
| -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 2cac4bc..5476b6f 100644 --- a/pyspike/distances.py +++ b/pyspike/distances.py @@ -212,7 +212,7 @@ def _generic_profile_multi(spike_trains, pair_distance_func, indices=None): assert (indices < len(spike_trains)).all() and (indices >= 0).all(), \ "Invalid index list." # generate a list of possible index pairs - pairs = [(i, j) for i in indices for j in indices[i+1:]] + pairs = [(indices[i], j) for i in range(len(indices)) for j in indices[i+1:]] # start with first pair (i, j) = pairs[0] average_dist = pair_distance_func(spike_trains[i], spike_trains[j]) @@ -251,7 +251,7 @@ def _multi_distance_par(spike_trains, pair_distance_func, indices=None): assert (indices < len(spike_trains)).all() and (indices >= 0).all(), \ "Invalid index list." # generate a list of possible index pairs - pairs = [(i, j) for i in indices for j in indices[i+1:]] + pairs = [(indices[i], j) for i in range(len(indices)) for j in indices[i+1:]] num_pairs = len(pairs) # start with first pair @@ -430,7 +430,7 @@ 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 = [(i, j) for i in indices for j in indices[i+1:]] + pairs = [(indices[i], j) for i in range(len(indices)) for j in indices[i+1:]] distance_matrix = np.zeros((len(indices), len(indices))) for i, j in pairs: |