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

remove try/except in _denoise_chambolle_nd. just use the numpy 1.6 compatible case

Browse Source
This commit is contained in:
Gregory R. Lee
2015-12-22 20:22:47 -05:00
committed by Gregory R. Lee
parent 4a0ad77780
commit 4bc4f0a169
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/restoration/_denoise.py
+1 -6
View File
@@ -175,12 +175,7 @@ def _denoise_tv_chambolle_nd(im, weight=0.2, eps=2.e-4, n_iter_max=200):
g[slices_g] = np.diff(out, axis=ax)
slices_g[ax] = slice(None)
try:
norm = np.sqrt((g*g).sum(-1, keepdims=True))
except:
# no keepdims argument available prior to numpy 1.7
norm = np.sqrt((g*g).sum(-1))[..., np.newaxis]
norm = np.sqrt((g*g).sum(-1))[..., np.newaxis]
E += weight * norm.sum()
norm *= 0.5 / weight
norm += 1.