diff options
| author | Richard Tomsett <r@autap.se> | 2014-12-17 17:05:52 +0900 |
|---|---|---|
| committer | Richard Tomsett <r@autap.se> | 2014-12-17 17:05:52 +0900 |
| commit | 4724eb755354458e8b0730ceecb52a1a9c1c7e52 (patch) | |
| tree | 31492a9dd24f56a80ff5734cd3316be6c664daf9 | |
| parent | 4fd98cc5f26c516f742c9b0a2dc787d309d65d32 (diff) | |
Fixed bug in distances.py when calculating pairs from arbitrary indices lists
| -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 c28fd7a..04ea77b 100644 --- a/pyspike/distances.py +++ b/pyspike/distances.py @@ -194,7 +194,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]) @@ -234,7 +234,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 @@ -384,7 +384,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: |