py3: division

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

2 files changed, 17 insertions, 14 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]])
diff --git a/test/test_regression/test_regression_15.py b/test/test_regression/test_regression_15.py
index 1ce1290..42a39ea 100644
--- a/test/test_regression/test_regression_15.py
+++ b/test/test_regression/test_regression_15.py
@@ -8,6 +8,8 @@ Distributed under the BSD License
 
 """
 
+from __future__ import division
+
 import numpy as np
 from numpy.testing import assert_equal, assert_almost_equal, \
     assert_array_almost_equal
@@ -25,13 +27,13 @@ def test_regression_15_isi():
     dist_mat = spk.isi_distance_matrix(spike_trains)
     assert_equal(dist_mat.shape, (N, N))
 
-    ind = np.arange(N/2)
+    ind = np.arange(N//2)
     dist_mat = spk.isi_distance_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
-    ind = np.arange(N/2, N)
+    ind = np.arange(N//2, N)
     dist_mat = spk.isi_distance_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
 
 def test_regression_15_spike():
@@ -44,13 +46,13 @@ def test_regression_15_spike():
     dist_mat = spk.spike_distance_matrix(spike_trains)
     assert_equal(dist_mat.shape, (N, N))
 
-    ind = np.arange(N/2)
+    ind = np.arange(N//2)
     dist_mat = spk.spike_distance_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
-    ind = np.arange(N/2, N)
+    ind = np.arange(N//2, N)
     dist_mat = spk.spike_distance_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
 
 def test_regression_15_sync():
@@ -63,13 +65,13 @@ def test_regression_15_sync():
     dist_mat = spk.spike_sync_matrix(spike_trains)
     assert_equal(dist_mat.shape, (N, N))
 
-    ind = np.arange(N/2)
+    ind = np.arange(N//2)
     dist_mat = spk.spike_sync_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
-    ind = np.arange(N/2, N)
+    ind = np.arange(N//2, N)
     dist_mat = spk.spike_sync_matrix(spike_trains, ind)
-    assert_equal(dist_mat.shape, (N/2, N/2))
+    assert_equal(dist_mat.shape, (N//2, N//2))
 
 
 if __name__ == "__main__":