Skip to content

Commit

Permalink
Update Variable and dask tests with _argmin_base, _argmax_base
Browse files Browse the repository at this point in the history
The basic numpy-style argmin() and argmax() methods were renamed when
adding support for handling multiple dimensions in DataArray.argmin()
and DataArray.argmax(). Variable.argmin() and Variable.argmax() are
therefore renamed as Variable._argmin_base() and
Variable._argmax_base().
  • Loading branch information
johnomotani committed Apr 6, 2020
1 parent 6d9d509 commit 70aaa9d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions xarray/tests/test_dask.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@ def test_reduce(self):
self.assertLazyAndAllClose(u.mean(), v.mean())
self.assertLazyAndAllClose(u.std(), v.std())
with raise_if_dask_computes():
actual = v.argmax(dim="x")
self.assertLazyAndAllClose(u.argmax(dim="x"), actual)
actual = v._argmax_base(dim="x")
self.assertLazyAndAllClose(u._argmax_base(dim="x"), actual)
with raise_if_dask_computes():
actual = v.argmin(dim="x")
self.assertLazyAndAllClose(u.argmin(dim="x"), actual)
actual = v._argmin_base(dim="x")
self.assertLazyAndAllClose(u._argmin_base(dim="x"), actual)
self.assertLazyAndAllClose((u > 1).any(), (v > 1).any())
self.assertLazyAndAllClose((u < 1).all("x"), (v < 1).all("x"))
with raises_regex(NotImplementedError, "only works along an axis"):
Expand Down
2 changes: 1 addition & 1 deletion xarray/tests/test_variable.py
Original file line number Diff line number Diff line change
Expand Up @@ -1657,7 +1657,7 @@ def test_reduce_funcs(self):
assert_identical(v.all(dim="x"), Variable([], False))

v = Variable("t", pd.date_range("2000-01-01", periods=3))
assert v.argmax(skipna=True) == 2
assert v._argmax_base(skipna=True) == 2

assert_identical(v.max(), Variable([], pd.Timestamp("2000-01-03")))

Expand Down

0 comments on commit 70aaa9d

Please sign in to comment.