From 3bb79b7a7ce537ba944fcf2126d875b43132b5e9 Mon Sep 17 00:00:00 2001 From: veni-vidi-vici-dormivi Date: Mon, 13 May 2024 15:20:35 +0200 Subject: [PATCH 1/3] rename i and j and some commentary --- mesmer/mesmer_m/power_transformer.py | 41 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/mesmer/mesmer_m/power_transformer.py b/mesmer/mesmer_m/power_transformer.py index 91bffa9c..9cbf480c 100644 --- a/mesmer/mesmer_m/power_transformer.py +++ b/mesmer/mesmer_m/power_transformer.py @@ -200,13 +200,13 @@ def transform(self, monthly_residuals, yearly_T): transformed_monthly_resids = np.zeros_like(monthly_residuals) - # for i, lmbda in enumerate(lambdas.T): - # for j,j_lmbda in enumerate(lmbda): + # for gridcell, lmbda in enumerate(lambdas.T): + # for year,year_lmbda in enumerate(lmbda): # with np.errstate(invalid='ignore'): # hide NaN warnings - # transformed_monthly_resids[j, i] = self._yeo_johnson_transform(monthly_residuals[j, i], j_lmbda) - for i, lmbda in enumerate(lambdas.T): - transformed_monthly_resids[:, i] = self._yeo_johnson_transform( - monthly_residuals[:, i], lmbda + # transformed_monthly_resids[year, gridcell] = self._yeo_johnson_transform(monthly_residuals[year, gridcell], year_lmbda) + for gridcell, lmbda in enumerate(lambdas.T): + transformed_monthly_resids[:, gridcell] = self._yeo_johnson_transform( + monthly_residuals[:, gridcell], lmbda ) if self.standardize: @@ -264,25 +264,24 @@ def inverse_transform(self, transformed_monthly_T, yearly_T): lambdas = self._get_yeo_johnson_lambdas(yearly_T) - # TODO: what actually is i? years or gridcells - for i, lmbda in enumerate(lambdas.T): - # TODO: what is j? years or gridcells? - for j, j_lmbda in enumerate(lmbda): + for gridcell, lmbda in enumerate(lambdas.T): + for year, y_lmbda in enumerate(lmbda): with np.errstate(invalid="ignore"): # hide NaN warnings - inverted_monthly_T[j, i] = self._yeo_johnson_inverse_transform( - transformed_monthly_T[j, i], j_lmbda + inverted_monthly_T[year, gridcell] = self._yeo_johnson_inverse_transform( + transformed_monthly_T[year, gridcell], y_lmbda ) - # TODO: what does this mean? - inverted_monthly_T[:, i] = np.where( - inverted_monthly_T[:, i] < self.mins_[i], - self.mins_[i], - inverted_monthly_T[:, i], + # clip values to not exceed original range + # apparently a relict from when lambda was not constrained to [0,2] + inverted_monthly_T[:, gridcell] = np.where( + inverted_monthly_T[:, gridcell] < self.mins_[gridcell], + self.mins_[gridcell], + inverted_monthly_T[:, gridcell], ) - inverted_monthly_T[:, i] = np.where( - inverted_monthly_T[:, i] > self.maxs_[i], - self.maxs_[i], - inverted_monthly_T[:, i], + inverted_monthly_T[:, gridcell] = np.where( + inverted_monthly_T[:, gridcell] > self.maxs_[gridcell], + self.maxs_[gridcell], + inverted_monthly_T[:, gridcell], ) return inverted_monthly_T From 2e77ec0a6ed9cbe407f7709a956c51cec4fbe1a0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 13:23:23 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- mesmer/mesmer_m/power_transformer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mesmer/mesmer_m/power_transformer.py b/mesmer/mesmer_m/power_transformer.py index 9cbf480c..162025bd 100644 --- a/mesmer/mesmer_m/power_transformer.py +++ b/mesmer/mesmer_m/power_transformer.py @@ -267,8 +267,10 @@ def inverse_transform(self, transformed_monthly_T, yearly_T): for gridcell, lmbda in enumerate(lambdas.T): for year, y_lmbda in enumerate(lmbda): with np.errstate(invalid="ignore"): # hide NaN warnings - inverted_monthly_T[year, gridcell] = self._yeo_johnson_inverse_transform( - transformed_monthly_T[year, gridcell], y_lmbda + inverted_monthly_T[year, gridcell] = ( + self._yeo_johnson_inverse_transform( + transformed_monthly_T[year, gridcell], y_lmbda + ) ) # clip values to not exceed original range From 3ea81a41bb46ff04b7fcfd4032581dfc38e8b043 Mon Sep 17 00:00:00 2001 From: Victoria <112418493+veni-vidi-vici-dormivi@users.noreply.github.com> Date: Mon, 13 May 2024 15:50:17 +0200 Subject: [PATCH 3/3] Update mesmer/mesmer_m/power_transformer.py Co-authored-by: Mathias Hauser --- mesmer/mesmer_m/power_transformer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesmer/mesmer_m/power_transformer.py b/mesmer/mesmer_m/power_transformer.py index 162025bd..d7469214 100644 --- a/mesmer/mesmer_m/power_transformer.py +++ b/mesmer/mesmer_m/power_transformer.py @@ -201,7 +201,7 @@ def transform(self, monthly_residuals, yearly_T): transformed_monthly_resids = np.zeros_like(monthly_residuals) # for gridcell, lmbda in enumerate(lambdas.T): - # for year,year_lmbda in enumerate(lmbda): + # for year, year_lmbda in enumerate(lmbda): # with np.errstate(invalid='ignore'): # hide NaN warnings # transformed_monthly_resids[year, gridcell] = self._yeo_johnson_transform(monthly_residuals[year, gridcell], year_lmbda) for gridcell, lmbda in enumerate(lambdas.T):