BF: make true division explicit for indices

Use true division / math.ceil to find indices.
matthew-brett · Jan 26, 2017 · b148483 · b148483
1 parent a94a998
commit b148483
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/nipy/algorithms/clustering/hierarchical_clustering.py b/nipy/algorithms/clustering/hierarchical_clustering.py
@@ -21,6 +21,7 @@
 """
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
 
 #---------------------------------------------------------------------------
 # ------ Routines for Agglomerative Hierarchical Clustering ----------------

diff --git a/nipy/algorithms/clustering/imm.py b/nipy/algorithms/clustering/imm.py
@@ -4,6 +4,7 @@
 """
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
 
 import math
 
@@ -601,7 +602,7 @@ def cross_validated_update(self, x, z, plike, null_class_proba, kfold=10):
         if np.isscalar(kfold):
             aux = np.argsort(np.random.rand(n_samples))
             idx = - np.ones(n_samples).astype(np.int)
-            j = np.ceil(n_samples / kfold)
+            j = int(math.ceil(n_samples / kfold))
             kmax = kfold
             for k in range(kmax):
                 idx[aux[k * j:min(n_samples, j * (k + 1))]] = k

diff --git a/nipy/algorithms/clustering/tests/test_hierarchical_clustering.py b/nipy/algorithms/clustering/tests/test_hierarchical_clustering.py
@@ -7,7 +7,7 @@
 
 Author : Bertrand Thirion, 2008-2009
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, division
 
 import math