Skip to content

Reject NaN values in bounded array validation #25

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

Open
DiadkoShmek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reject NaN values in bounded array validation #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dm_env/specs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def __eq__(self, other):
def validate(self, value):
value = np.asarray(value)
super(BoundedArray, self).validate(value)
if (value < self.minimum).any() or (value > self.maximum).any():
if not (value >= self.minimum).all() or not (value <= self.maximum).all():
self._fail_validation(_OUT_OF_BOUNDS, self.minimum, value, self.maximum)
return value

Expand Down
14 changes: 14 additions & 0 deletions dm_env/specs_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,20 @@ def testValidateBoundsFloat(self, minimum, maximum, value, is_valid):
specs._OUT_OF_BOUNDS % (spec.minimum, value, spec.maximum)):
spec.validate(value)

@parameterized.parameters(
dict(shape=(), minimum=0., maximum=1., value=np.nan),
dict(shape=(2,), minimum=-1., maximum=1., value=[0., np.nan]),
dict(shape=(2,), minimum=[-1., 0.], maximum=[0., 1.],
value=[np.nan, 0.5]),
dict(shape=(), minimum=-np.inf, maximum=np.inf, value=np.nan),
)
def testValidateRejectsNaN(self, shape, minimum, maximum, value):
spec = specs.BoundedArray(shape, np.float64, minimum, maximum)
value = np.asarray(value, dtype=spec.dtype)
with self.assertRaisesWithLiteralMatch(
ValueError, specs._OUT_OF_BOUNDS % (spec.minimum, value, spec.maximum)):
spec.validate(value)

def testValidateReturnsValue(self):
spec = specs.BoundedArray([1], np.int32, minimum=0, maximum=1)
validated_value = spec.validate(np.array([0], dtype=np.int32))
Expand Down
15 changes: 15 additions & 0 deletions dm_env/test_utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,21 @@ def wrapped_method(
]
)

TestNaNDiscount = _make_test_case_with_expected_failures(
name='TestNaNDiscount',
timestep_sequence=[
FIRST,
MID._replace(discount=np.nan), # NaN is not in the interval [0, 1].
MID,
LAST,
],
expected_failures=[
('test_step_after_reset', ValueError),
('test_step_on_fresh_environment', ValueError),
('test_longer_action_sequence', ValueError),
]
)

TestInvalidObservation = _make_test_case_with_expected_failures(
name='TestInvalidObservation',
timestep_sequence=[
Expand Down
Loading