diff options
| author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-08-11 15:37:05 +0200 |
|---|---|---|
| committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-08-11 15:37:05 +0200 |
| commit | 7ea6486e94d2f750ebaead3649f94f84cc9466b9 (patch) | |
| tree | ee05d88fe5d1570ce77ac34780edd68b8f68a1fc | |
| parent | 5119d47d0f00c3f7203cf94460730b59a7e473ec (diff) | |
| parent | 3c6cdfe943e54880325c5ee81ab0d96a6bb101de (diff) | |
Merge branch 'ImmanuelSamuel-master' into develop
fixes #11
| -rw-r--r-- | pyspike/generic.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyspike/generic.py b/pyspike/generic.py index 41affcb..2df34f1 100644 --- a/pyspike/generic.py +++ b/pyspike/generic.py @@ -37,13 +37,13 @@ def _generic_profile_multi(spike_trains, pair_distance_func, indices=None): """ L1 = len(pairs1) if L1 > 1: - dist_prof1 = divide_and_conquer(pairs1[:L1/2], pairs1[L1/2:]) + dist_prof1 = divide_and_conquer(pairs1[:L1//2], pairs1[int(L1//2):]) else: dist_prof1 = pair_distance_func(spike_trains[pairs1[0][0]], spike_trains[pairs1[0][1]]) L2 = len(pairs2) if L2 > 1: - dist_prof2 = divide_and_conquer(pairs2[:L2/2], pairs2[L2/2:]) + dist_prof2 = divide_and_conquer(pairs2[:L2//2], pairs2[int(L2//2):]) else: dist_prof2 = pair_distance_func(spike_trains[pairs2[0][0]], spike_trains[pairs2[0][1]]) @@ -63,8 +63,8 @@ def _generic_profile_multi(spike_trains, pair_distance_func, indices=None): L = len(pairs) if L > 1: # recursive iteration through the list of pairs to get average profile - avrg_dist = divide_and_conquer(pairs[:len(pairs)/2], - pairs[len(pairs)/2:]) + avrg_dist = divide_and_conquer(pairs[:len(pairs)//2], + pairs[len(pairs)//2:]) else: avrg_dist = pair_distance_func(spike_trains[pairs[0][0]], spike_trains[pairs[0][1]]) |