From c8fa3b48e557ddf3d171b19ded81fc707958e70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 2 May 2013 18:19:39 +0200 Subject: [PATCH] Replace is_degenerate tests with is_data_valid and is_model_valid tests --- skimage/measure/tests/test_fit.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/skimage/measure/tests/test_fit.py b/skimage/measure/tests/test_fit.py index e565df7b..7faa3c0b 100644 --- a/skimage/measure/tests/test_fit.py +++ b/skimage/measure/tests/test_fit.py @@ -16,10 +16,6 @@ def test_line_model_predict(): assert_almost_equal(x, model.predict_x(y)) -def test_line_model_is_degenerate(): - assert_equal(LineModel().is_degenerate(np.empty((1, 2))), True) - - def test_line_model_estimate(): # generate original data without noise model0 = LineModel() @@ -54,10 +50,6 @@ def test_circle_model_predict(): assert_almost_equal(xy, model.predict_xy(t)) -def test_circle_model_is_degenerate(): - assert_equal(CircleModel().is_degenerate(np.empty((1, 2))), True) - - def test_circle_model_estimate(): # generate original data without noise model0 = CircleModel() @@ -91,10 +83,6 @@ def test_ellipse_model_predict(): assert_almost_equal(xy, model.predict_xy(t)) -def test_ellipse_model_is_degenerate(): - assert_equal(EllipseModel().is_degenerate(np.empty((1, 2))), True) - - def test_ellipse_model_estimate(): # generate original data without noise model0 = EllipseModel() @@ -158,5 +146,22 @@ def test_ransac_geometric(): assert outlier not in inliers +def test_ransac_is_data_valid(): + is_data_valid = lambda data: data.shape[0] > 2 + model, inliers = ransac(np.empty((10, 2)), LineModel, 2, np.inf, + is_data_valid=is_data_valid) + assert_equal(model, None) + assert_equal(inliers, None) + + +def test_ransac_is_model_valid(): + def is_model_valid(model, data): + return False + model, inliers = ransac(np.empty((10, 2)), LineModel, 2, np.inf, + is_model_valid=is_model_valid) + assert_equal(model, None) + assert_equal(inliers, None) + + if __name__ == "__main__": np.testing.run_module_suite()