From 72eb68268392cd83616f3cf5f532edc81976b0fd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:57:50 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mesmer/calibrate_mesmer/train_gv.py | 14 ++++++------- mesmer/calibrate_mesmer/train_lv.py | 22 ++++++++++----------- mesmer/stats/_auto_regression.py | 2 +- tests/unit/test_auto_regression_scen_ens.py | 1 + 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/mesmer/calibrate_mesmer/train_gv.py b/mesmer/calibrate_mesmer/train_gv.py index 275eeab7..2b7f7d6d 100644 --- a/mesmer/calibrate_mesmer/train_gv.py +++ b/mesmer/calibrate_mesmer/train_gv.py @@ -171,13 +171,13 @@ def train_gv_AR(params_gv, gv, max_lag, sel_crit): # create temporary DataArray objects data = [ - xr.DataArray( - data, - dims=["run", "time"], - coords=[np.arange(data.shape[0]), np.arange(data.shape[1])], - ) - for data in gv.values() - ] + xr.DataArray( + data, + dims=["run", "time"], + coords=[np.arange(data.shape[0]), np.arange(data.shape[1])], + ) + for data in gv.values() + ] AR_order = _select_ar_order_scen_ens( *data, dim="time", ens_dim="run", maxlag=max_lag, ic=sel_crit diff --git a/mesmer/calibrate_mesmer/train_lv.py b/mesmer/calibrate_mesmer/train_lv.py index 4bfd27fe..daf4d104 100644 --- a/mesmer/calibrate_mesmer/train_lv.py +++ b/mesmer/calibrate_mesmer/train_lv.py @@ -233,17 +233,17 @@ def train_lv_AR1_sci(params_lv, targs, y, wgt_scen_eq, aux, cfg): # create temporary DataArray dims = ("run", "time", "cell") data = [ - xr.DataArray( - data, - dims=dims, - coords=( - np.arange(data.shape[0]), - np.arange(data.shape[1]), - np.arange(data.shape[2]), - ), - ) - for data in targ.values() - ] + xr.DataArray( + data, + dims=dims, + coords=( + np.arange(data.shape[0]), + np.arange(data.shape[1]), + np.arange(data.shape[2]), + ), + ) + for data in targ.values() + ] params = _fit_auto_regression_scen_ens(*data, dim="time", ens_dim="run", lags=1) diff --git a/mesmer/stats/_auto_regression.py b/mesmer/stats/_auto_regression.py index 53db871b..02775346 100644 --- a/mesmer/stats/_auto_regression.py +++ b/mesmer/stats/_auto_regression.py @@ -93,7 +93,7 @@ def _fit_auto_regression_scen_ens(*objs, dim, ens_dim, lags): for obj in objs: ar_params = fit_auto_regression(obj, dim=dim, lags=int(lags)) - #TODO: think about weighting! see https://github.com/MESMER-group/mesmer/issues/307 + # TODO: think about weighting! see https://github.com/MESMER-group/mesmer/issues/307 if ens_dim in ar_params.dims: ar_params = ar_params.mean(ens_dim) diff --git a/tests/unit/test_auto_regression_scen_ens.py b/tests/unit/test_auto_regression_scen_ens.py index b9840c93..2a630361 100644 --- a/tests/unit/test_auto_regression_scen_ens.py +++ b/tests/unit/test_auto_regression_scen_ens.py @@ -96,6 +96,7 @@ def test_fit_auto_regression_scen_ens_multi_scen(): xr.testing.assert_equal(result, expected) + def test_fit_auto_regression_scen_ens_no_ens_dim(): da = generate_ar_samples([1, 0.5, 0.3, 0.4], n_timesteps=100, n_ens=4)