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

PKG: Rename as_windows to view_as_windows.

Browse Source
This commit is contained in:
Stefan van der Walt
2012-06-24 17:58:32 -07:00
parent fce9de633d
commit 635b836c08
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/measure/_structural_similarity.py
+4 -4
View File
@@ -5,7 +5,7 @@ __all__ = ['structural_similarity']
import numpy as np import numpy as np
from ..util.dtype import dtype_range from ..util.dtype import dtype_range
from ..util.shape import as_windows from ..util.shape import view_as_windows
def structural_similarity(X, Y, win_size=7, def structural_similarity(X, Y, win_size=7,
gradient=False, dynamic_range=None): gradient=False, dynamic_range=None):
@@ -54,8 +54,8 @@ def structural_similarity(X, Y, win_size=7,
dmin, dmax = dtype_range[X.dtype.type] dmin, dmax = dtype_range[X.dtype.type]
dynamic_range = dmax - dmin dynamic_range = dmax - dmin
XW = as_windows(X, win_size=win_size) XW = view_as_windows(X, win_size=win_size)
YW = as_windows(Y, win_size=win_size) YW = view_as_windows(Y, win_size=win_size)
NS = len(XW) NS = len(XW)
NP = win_size * win_size NP = win_size * win_size
@@ -94,7 +94,7 @@ def structural_similarity(X, Y, win_size=7,
) )
grad = np.zeros_like(X, dtype=float) grad = np.zeros_like(X, dtype=float)
OW = as_windows(grad, win_size=win_size) OW = view_as_windows(grad, win_size=win_size)
OW += local_grad OW += local_grad
grad /= NS grad /= NS
skimage/util/shape.py
+4 -3
View File
@@ -234,9 +234,9 @@ def view_as_windows(arr_in, window_shape):
import numpy as np import numpy as np
from numpy.lib import stride_tricks from numpy.lib import stride_tricks
__all__ = ['as_windows'] __all__ = ['view_as_windows']
def as_windows(X, win_size=7): def view_as_windows(X, win_size=7):
"""Re-stride an array to simulate a sliding window. """Re-stride an array to simulate a sliding window.
Parameters Parameters
@@ -249,7 +249,8 @@ def as_windows(X, win_size=7):
Returns Returns
------- -------
window : (N, M, win_size, win_size) ndarray window : (N, M, win_size, win_size) ndarray
Sliding windows. A view on the original data, representing sliding windows. Note:
modifying this view will also modify the original data.
""" """
if not X.ndim == 2: if not X.ndim == 2: