wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-02 02:43:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace is_degenerate tests with is_data_valid and is_model_valid tests

Browse Source
This commit is contained in:
Johannes Schönberger
2013-05-02 18:19:39 +02:00
parent 8d92f5c02b
commit c8fa3b48e5
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/measure/tests/test_fit.py
+17 -12
View File
@@ -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()