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

rename i and j in power transformer transform & inverse transform #444

Merged
merged 3 commits into from
May 14, 2024
Merged

rename i and j in power transformer transform & inverse transform #444

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bb79b7
rename i and j and some commentary
veni-vidi-vici-dormivi May 13, 2024
2e77ec0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 13, 2024
3ea81a4
Update mesmer/mesmer_m/power_transformer.py
veni-vidi-vici-dormivi May 13, 2024
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
43 changes: 22 additions & 21 deletions mesmer/mesmer_m/power_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -264,25 +264,26 @@ 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