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

BUG: Fixed another division error

Browse Source
This commit is contained in:
Steven Silvester
2012-12-28 01:33:01 -06:00
parent 713e5dc734
commit 1af3d69cde
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/exposure/_adapthist.py
+4 -4
View File
@@ -158,11 +158,11 @@ def _clahe(image, ntiles_x, ntiles_y, clip_limit, nbins=128):
for y in range(ntiles_y + 1):
xstart = 0
if y == 0: # special case: top row
ystep = y_size / 2
ystep = int(y_size / 2)
yU = 0
yB = 0
elif y == ntiles_y: # special case: bottom row
ystep = y_size / 2
ystep = int(y_size / 2)
yU = ntiles_y - 1
yB = yU
else: # default values
@@ -172,11 +172,11 @@ def _clahe(image, ntiles_x, ntiles_y, clip_limit, nbins=128):
for x in range(ntiles_x + 1):
if x == 0: # special case: left column
xstep = x_size / 2
xstep = int(x_size / 2)
xL = 0
xR = 0
elif x == ntiles_x: # special case: right column
xstep = x_size / 2
xstep = int(x_size / 2)
xL = ntiles_x - 1
xR = xL
else: # default values
skimage/exposure/tests/test_exposure.py
+8 -6
View File
@@ -87,8 +87,9 @@ def test_adapthist_scalar():
full_scale = skimage.exposure.rescale_intensity(skimage.img_as_uint(img))
assert_almost_equal = np.testing.assert_almost_equal
assert peak_snr(full_scale, adapted) > 95.0
assert norm_brightness_err(full_scale, adapted) < 0.05
assert_almost_equal(peak_snr(full_scale, adapted), 101.231, 3)
assert_almost_equal(norm_brightness_err(full_scale, adapted),
0.041, 3)
return img, adapted
@@ -102,8 +103,8 @@ def test_adapthist_grayscale():
nbins=128)
assert_almost_equal = np.testing.assert_almost_equal
assert img.shape == adapted.shape
assert peak_snr(img, adapted) > 95.0
assert norm_brightness_err(img, adapted) < 0.05
assert_almost_equal(peak_snr(img, adapted), 97.949, 3)
assert_almost_equal(norm_brightness_err(img, adapted), 0.03077, 3)
return data, adapted
@@ -117,8 +118,9 @@ def test_adapthist_color():
assert adapted.max() == 1.0
assert img.shape == adapted.shape
full_scale = skimage.exposure.rescale_intensity(img)
assert peak_snr(img, adapted) > 95.0
assert norm_brightness_err(img, adapted) < 0.05
assert_almost_equal(peak_snr(full_scale, adapted), 102.940, 3)
assert_almost_equal(norm_brightness_err(full_scale, adapted),
0.0110, 3)
return data, adapted