Merge pull request #1558 from blink1073/optimized-window

ENH: Create an optimal_step parameter for view_as_windows
This commit is contained in:
Josh Warner
2015-06-15 20:50:36 -05:00
2 changed files with 30 additions and 1 deletions
+14 -1
View File
@@ -1,3 +1,4 @@
from __future__ import division
import numbers
import numpy as np
from numpy.lib.stride_tricks import as_strided
@@ -103,7 +104,7 @@ def view_as_blocks(arr_in, block_shape):
return arr_out
def view_as_windows(arr_in, window_shape, step=1):
def view_as_windows(arr_in, window_shape, step=1, optimal_step=False):
"""Rolling window view of the input n-dimensional array.
Windows are overlapping views of the input array, with adjacent windows
@@ -121,6 +122,9 @@ def view_as_windows(arr_in, window_shape, step=1):
step : integer or tuple of length arr_in.ndim
Indicates step size at which extraction shall be performed.
If integer is given, then the step is uniform in all dimensions.
optimal_step: bool, optional
When True, selects a ``step`` that will give full coverage of
``arr_in`` with minimal overlap.
Returns
-------
@@ -225,6 +229,15 @@ def view_as_windows(arr_in, window_shape, step=1):
if not (len(window_shape) == ndim):
raise ValueError("`window_shape` is incompatible with `arr_in.shape`")
if optimal_step:
rem = np.array(arr_in.shape) - np.array(window_shape)
step = list(window_shape)
for (ind, size) in enumerate(window_shape):
ns = int(np.ceil(arr_in.shape[ind] / size))
while step[ind] * (ns - 1) > rem[ind]:
step[ind] -= 1
if isinstance(step, numbers.Number):
if step < 1:
raise ValueError("`step` must be >= 1")
+16
View File
@@ -176,5 +176,21 @@ def test_view_as_windows_step_tuple():
[22, 23]]]])
def test_view_as_windows_optimal_step():
A = np.arange(24).reshape((6, 4))
B = view_as_windows(A, (3, 2), optimal_step=True)
assert B.shape == (2, 2, 3, 2)
assert B.size == A.size
A = np.arange(512 * 512).reshape((512, 512))
B = view_as_windows(A, (10, 10), optimal_step=True)
assert B.shape == (56, 56, 10, 10)
assert B.size >= A.size
C = view_as_windows(A, (11, 9), optimal_step=True)
assert C.shape == (51, 63, 11, 9)
assert C.size >= A.size
if __name__ == '__main__':
np.testing.run_module_suite()