From b7254f225ce10c371310363f5af611d3d3ac0f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 25 Dec 2012 11:26:43 +0100 Subject: [PATCH] Update denoising example --- doc/examples/plot_denoise.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index cfcec5e4..debb2ea6 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -30,12 +30,12 @@ import numpy as np import matplotlib.pyplot as plt from skimage import data, color, img_as_float -from skimage.filter import denoise_tv, denoise_bilateral +from skimage.filter import denoise_tv_chambolle, denoise_bilateral -lena = color.rgb2gray(img_as_float(data.lena())) +lena = img_as_float(data.lena()) lena = lena[220:300, 220:320] -noisy = lena + 0.5 * lena.std() * np.random.random(lena.shape) +noisy = lena + 0.6 * lena.std() * np.random.random(lena.shape) noisy = np.clip(noisy, 0, 1) fig, ax = plt.subplots(nrows=2, ncols=3, figsize=(8, 5)) @@ -45,17 +45,17 @@ plt.gray() ax[0, 0].imshow(noisy) ax[0, 0].axis('off') ax[0, 0].set_title('noisy') -ax[0, 1].imshow(denoise_tv(noisy, weight=40)) +ax[0, 1].imshow(denoise_tv_chambolle(noisy, weight=0.1, multichannel=True)) ax[0, 1].axis('off') ax[0, 1].set_title('TV') -ax[0, 2].imshow(denoise_bilateral(noisy, sigma_range=0.03, sigma_spatial=15)) +ax[0, 2].imshow(denoise_bilateral(noisy, sigma_range=0.05, sigma_spatial=15)) ax[0, 2].axis('off') ax[0, 2].set_title('Bilateral') -ax[1, 0].imshow(denoise_tv(noisy, weight=20)) +ax[1, 0].imshow(denoise_tv_chambolle(noisy, weight=0.2, multichannel=True)) ax[1, 0].axis('off') ax[1, 0].set_title('(more) TV') -ax[1, 1].imshow(denoise_bilateral(noisy, sigma_range=0.06, sigma_spatial=15)) +ax[1, 1].imshow(denoise_bilateral(noisy, sigma_range=0.1, sigma_spatial=15)) ax[1, 1].axis('off') ax[1, 1].set_title('(more) Bilateral') ax[1, 2].imshow(lena)