From bb1f7df444d891d15565a9722ab6da1d742b582f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 4 Nov 2013 08:04:14 +0100 Subject: [PATCH] Improve usage of doctest directives --- skimage/measure/_marching_cubes.py | 3 +-- skimage/measure/fit.py | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/skimage/measure/_marching_cubes.py b/skimage/measure/_marching_cubes.py index 69e85cfd..7ea0667e 100644 --- a/skimage/measure/_marching_cubes.py +++ b/skimage/measure/_marching_cubes.py @@ -75,8 +75,7 @@ def marching_cubes(volume, level, spacing=(1., 1., 1.)): is recommended. To contour a volume named `myvolume` about the level 0.0:: >>> from mayavi import mlab # doctest: +SKIP - >>> verts, tris = marching_cubes(myvolume, 0.0, (1., 1., 2.)) \\ - ... # doctest: +SKIP + >>> verts, tris = marching_cubes(myvolume, 0.0, (1., 1., 2.)) # doctest: +SKIP >>> mlab.triangular_mesh([vert[0] for vert in verts], ... [vert[1] for vert in verts], ... [vert[2] for vert in verts], diff --git a/skimage/measure/fit.py b/skimage/measure/fit.py index 9f6f91b6..9fb903e4 100644 --- a/skimage/measure/fit.py +++ b/skimage/measure/fit.py @@ -550,7 +550,7 @@ def ransac(data, model_class, min_samples, residual_threshold, >>> model = EllipseModel() >>> model.estimate(data) - >>> model._params # doctest: +SKIP + >>> model._params # doctest: +ELLIPSIS array([ -3.30354146e+03, -2.87791160e+03, 5.59062118e+03, 7.84365066e+00, 7.19203152e-01]) @@ -558,9 +558,9 @@ def ransac(data, model_class, min_samples, residual_threshold, Estimate ellipse model using RANSAC: >>> ransac_model, inliers = ransac(data, EllipseModel, 5, 3, max_trials=50) - >>> ransac_model._params # doctest: +SKIP + >>> ransac_model._params # doctest: +ELLIPSIS array([ 20.12762373, 29.73563063, 4.81499637, 10.4743584 , 0.05217117]) - >>> inliers # doctest: +SKIP + >>> inliers # doctest: +ELLIPSIS array([False, False, False, False, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, @@ -579,7 +579,7 @@ def ransac(data, model_class, min_samples, residual_threshold, >>> dst[1] = (-100, 100) >>> dst[2] = (50, 50) >>> model, inliers = ransac((src, dst), SimilarityTransform, 2, 10) - >>> inliers # doctest: +SKIP + >>> inliers # doctest: +ELLIPSIS array([False, False, False, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True,