Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow shift_range to be 1-D array-like or int #8869

Merged
merged 7 commits into from
Apr 15, 2018
Merged

Allow shift_range to be 1-D array-like or int #8869

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c0d2f76
Allow shift_range to be 1-D array-like or int
ozabluda Dec 22, 2017
def319d
Add docstrings
ozabluda Jan 28, 2018
32a24d5
Merge branch 'master' into patch-26
ozabluda Jan 28, 2018
1484457
Fix conflict resolution merge minor disaster
ozabluda Jan 28, 2018
541c452
remove stray line from merge
ozabluda Feb 2, 2018
5f062c5
Remove extra "tabs"
ozabluda Feb 2, 2018
d5353b9
Merge branch 'master' into patch-26
ozabluda Apr 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions keras/preprocessing/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,15 @@ class ImageDataGenerator(object):
zca_epsilon: epsilon for ZCA whitening. Default is 1e-6.
zca_whitening: Boolean. Apply ZCA whitening.
rotation_range: Int. Degree range for random rotations.
width_shift_range: Float (fraction of total width). Range for random horizontal shifts.
height_shift_range: Float (fraction of total height). Range for random vertical shifts.
width_shift_range: float, 1-D array-like or int
float: fraction of total width, if < 1, or pixels if >= 1.
1-D array-like: random elements from the array.
int: integer number of pixels from interval
`(-width_shift_range, +width_shift_range)`
With `width_shift_range=2` possible values are integers [-1, 0, +1],
same as with `width_shift_range=[-1, 0, +1]`,
while with `width_shift_range=1.0` possible values are floats in
the interval [-1.0, +1.0).
shear_range: Float. Shear Intensity (Shear angle in counter-clockwise direction in degrees)
zoom_range: Float or [lower, upper]. Range for random zoom. If a float, `[lower, upper] = [1-zoom_range, 1+zoom_range]`.
channel_shift_range: Float. Range for random channel shifts.
Expand Down Expand Up @@ -839,15 +846,25 @@ def random_transform(self, x, seed=None):
theta = 0

if self.height_shift_range:
tx = np.random.uniform(-self.height_shift_range, self.height_shift_range)
if self.height_shift_range < 1:
try: # 1-D array-like or int
tx = np.random.choice(self.height_shift_range)
tx *= np.random.choice([-1, 1])
except ValueError: # floating point
tx = np.random.uniform(-self.height_shift_range,
self.height_shift_range)
if np.max(self.height_shift_range) < 1:
tx *= x.shape[img_row_axis]
else:
tx = 0

if self.width_shift_range:
ty = np.random.uniform(-self.width_shift_range, self.width_shift_range)
if self.width_shift_range < 1:
try: # 1-D array-like or int
ty = np.random.choice(self.width_shift_range)
ty *= np.random.choice([-1, 1])
except ValueError: # floating point
ty = np.random.uniform(-self.width_shift_range,
self.width_shift_range)
if np.max(self.width_shift_range) < 1:
ty *= x.shape[img_col_axis]
else:
ty = 0
Expand Down