summaryrefslogtreecommitdiff
path: root/pyspike
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-12-13 11:01:34 +0100
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-12-14 01:33:11 +0100
commitfe1f6179cce645df2511bfedae3af90167308f5f (patch)
tree25555c8d59ed2a52b7698ba61ba0f7c80ecee112 /pyspike
parent2c42e59e5097d3b9745e6eae2bee8f1ff27f7e09 (diff)
py3: division
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'pyspike')
-rw-r--r--pyspike/generic.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyspike/generic.py b/pyspike/generic.py
index 81ae660..5ad06f1 100644
--- a/pyspike/generic.py
+++ b/pyspike/generic.py
@@ -7,6 +7,7 @@ Copyright 2015, Mario Mulansky <mario.mulansky@gmx.net>
Distributed under the BSD License
"""
+from __future__ import division
import numpy as np
@@ -38,14 +39,14 @@ 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[int(L1//2):])
+ pairs1[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[int(L2//2):])
+ pairs2[L2//2:])
else:
dist_prof2 = pair_distance_func(spike_trains[pairs2[0][0]],
spike_trains[pairs2[0][1]])