From 47a4418140d10fba79793341033c3d58535cbc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sun, 8 Mar 2015 19:37:53 -0400 Subject: [PATCH] Use np.inf instead of float('inf') --- skimage/measure/fit.py | 6 +++--- skimage/measure/tests/test_fit.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/measure/fit.py b/skimage/measure/fit.py index ad48101b..f8e65117 100644 --- a/skimage/measure/fit.py +++ b/skimage/measure/fit.py @@ -505,18 +505,18 @@ def _dynamic_max_trials(n_inliers, n_samples, min_samples, probability): Number of trials. """ if n_inliers == 0: - return float('inf') + return np.inf nom = 1 - probability if nom == 0: - return float('inf') + return np.inf inlier_ratio = n_inliers / float(n_samples) denom = 1 - inlier_ratio ** min_samples if denom == 0: return 1 elif denom == 1: - return float('inf') + return np.inf nom = np.log(nom) denom = np.log(denom) diff --git a/skimage/measure/tests/test_fit.py b/skimage/measure/tests/test_fit.py index 1c3a6f43..7f98c971 100644 --- a/skimage/measure/tests/test_fit.py +++ b/skimage/measure/tests/test_fit.py @@ -235,7 +235,7 @@ def test_ransac_dynamic_max_trials(): # e = 0%, min_samples = 5 assert_equal(_dynamic_max_trials(1, 100, 5, 0), 0) - assert_equal(_dynamic_max_trials(1, 100, 5, 1), float('inf')) + assert_equal(_dynamic_max_trials(1, 100, 5, 1), np.inf) def test_ransac_invalid_input():