diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-22 16:19:37 +0100 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-01-22 16:19:37 +0100 |
commit | 27121e76e92a244c484b970f61da990eff19dc1d (patch) | |
tree | 3407050f25ab7b2c0561208b6376db956693834f /pyspike | |
parent | 7bec7f0fe1c40146e8b45757d4c156a4f9b49001 (diff) | |
parent | e30a16a76a78aad51c59972b6c5eae3dd74f0459 (diff) |
Merge branch 'richardtomsett-master'
Diffstat (limited to 'pyspike')
-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: |