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

Fix adapthist mask logic

Browse Source 
Use minlength in bincount

Fix mask logic
This commit is contained in:
Steven Silvester
2015-10-19 18:07:32 -05:00
parent a2d74e5260
commit 41159f3fd2
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
+5 -3
View File
@@ -247,12 +247,14 @@ def clip_histogram(hist, clip_limit):
while n_excess > 0: # Redistribute remaining excess
index = 0
while n_excess > 0 and index < hist.size:
under_mask = hist < 0
step_size = int(hist[hist < clip_limit].size / n_excess)
step_size = max(step_size, 1)
indices = np.arange(index, hist.size, step_size)
under = hist[indices] < clip_limit
hist[under] += 1
n_excess -= hist[under].size
under_mask[indices] = True
under_mask = (under_mask) & (hist < clip_limit)
hist[under_mask] += 1
n_excess -= under_mask.sum()
index += 1
return hist
skimage/exposure/tests/test_exposure.py
+7 -7
View File
@@ -199,9 +199,9 @@ def test_adapthist_scalar():
full_scale = skimage.exposure.rescale_intensity(skimage.img_as_float(img))
assert_almost_equal = np.testing.assert_almost_equal
assert_almost_equal(peak_snr(full_scale, adapted), 101.2295, 3)
assert_almost_equal(peak_snr(full_scale, adapted), 102.066, 3)
assert_almost_equal(norm_brightness_err(full_scale, adapted),
0.041, 3)
0.038, 3)
return img, adapted
@@ -217,8 +217,8 @@ def test_adapthist_grayscale():
nbins=128)
adapted = exposure.equalize_adapthist(img, kernel_size=(57, 51), clip_limit=0.01, nbins=128)
assert img.shape == adapted.shape
assert_almost_equal(peak_snr(img, adapted), 101.750, 3)
assert_almost_equal(norm_brightness_err(img, adapted), 0.0540, 3)
assert_almost_equal(peak_snr(img, adapted), 102.078, 3)
assert_almost_equal(norm_brightness_err(img, adapted), 0.0529, 3)
return data, adapted
@@ -238,7 +238,7 @@ def test_adapthist_color():
assert adapted.max() == 1.0
assert img.shape == adapted.shape
full_scale = skimage.exposure.rescale_intensity(img)
assert_almost_equal(peak_snr(full_scale, adapted), 109.6, 1)
assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 1)
assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.02, 2)
return data, adapted
@@ -256,8 +256,8 @@ def test_adapthist_alpha():
full_scale = skimage.exposure.rescale_intensity(img)
assert img.shape == adapted.shape
assert_almost_equal = np.testing.assert_almost_equal
assert_almost_equal(peak_snr(full_scale, adapted), 109.60, 2)
assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0235, 3)
assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 2)
assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0248, 3)
def peak_snr(img1, img2):