ENH: Add faster numpy hough version as well as a Cython version. Add appropriate setup.py files to build the Cython module. Fix hough tests.

Conflicts:

	scikits/image/setup.py
	scikits/image/transform/hough_transform.py
	scikits/image/transform/tests/test_hough_transform.py
This commit is contained in:
Stefan van der Walt
2011-04-08 19:07:58 +02:00
parent 97806c76f4
commit 520c54f5ec
5 changed files with 173 additions and 70 deletions
@@ -5,17 +5,18 @@ from scikits.image.transform import *
def test_hough():
# Generate a test image
img = np.zeros((100, 150), dtype=bool)
img[30, :] = 1
img[:, 65] = 1
img[35:45, 35:50] = 1
for i in range(90):
img[i, i] = 1
img = np.zeros((100, 100), dtype=int)
for i in range(25, 75):
img[100 - i, i] = 1
out, angles, d = hough(img)
assert_equal(out.max(), 100)
assert_equal(len(angles), 180)
y, x = np.where(out == out.max())
dist = d[y[0]]
theta = angles[x[0]]
assert_equal(dist > 70, dist < 72)
assert_equal(theta > 0.78, theta < 0.79)
def test_hough_angles():
img = np.zeros((10, 10))