Skip to content

Commit

Permalink
Demo what a 90/95 line length would do
Browse files Browse the repository at this point in the history
  • Loading branch information
hdoupe committed Feb 6, 2021
1 parent 374b0b9 commit 5bf975d
Showing 1 changed file with 8 additions and 20 deletions.
28 changes: 8 additions & 20 deletions taxcalc/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
)

rate_adjustment_vals = (
self.sel["parameter_indexing_CPI_offset"]["year"]
>= cpi_min_year["year"]
self.sel["parameter_indexing_CPI_offset"]["year"] >= cpi_min_year["year"]
)
# "Undo" any existing parameter_indexing_CPI_offset for
# years after parameter_indexing_CPI_offset has
Expand All @@ -296,9 +295,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
# Then apply new parameter_indexing_CPI_offset values to
# inflation rates
for cpi_vo in rate_adjustment_vals:
self._inflation_rates[
cpi_vo["year"] - self.start_year
] += cpi_vo["value"]
self._inflation_rates[cpi_vo["year"] - self.start_year] += cpi_vo["value"]
# 1. Delete all unknown values.
# 1.a For revision, these are years specified after cpi_min_year.
init_vals = {}
Expand All @@ -313,12 +310,9 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
param = param.split("-indexed")[0]
if self._data[param].get("indexed", False):
init_vals[param] = (
self.sel[self._init_values[param]]["year"]
<= cpi_min_year["year"]
)
to_delete[param] = (
self.sel[param]["year"] > cpi_min_year["year"]
self.sel[self._init_values[param]]["year"] <= cpi_min_year["year"]
)
to_delete[param] = self.sel[param]["year"] > cpi_min_year["year"]
needs_reset.append(param)
self.delete(to_delete, **kwargs)
super().adjust(init_vals, **kwargs)
Expand Down Expand Up @@ -359,8 +353,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
# Create new dict to avoid modifying the original
dict(
vo,
value=min(9e99, round(
vo["value"] * final_ifactor, 0)),
value=min(9e99, round(vo["value"] * final_ifactor, 0)),
year=fyear,
)
)
Expand All @@ -378,8 +371,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
continue
if self._data[param].get("indexed", False):
init_vals[param] = (
self.sel[self._init_values[param]]['year']
<= last_known_year
self.sel[self._init_values[param]]['year'] <= last_known_year
)
to_delete[param] = self.sel[param]["_auto"] == True # noqa
needs_reset.append(param)
Expand All @@ -406,9 +398,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
indexed_changes[self.start_year] = values
elif isinstance(values, list):
for vo in values:
indexed_changes[vo.get("year", self.start_year)] = vo[
"value"
]
indexed_changes[vo.get("year", self.start_year)] = vo["value"]
else:
msg = (
"Index adjustment parameter must be a boolean or "
Expand Down Expand Up @@ -468,9 +458,7 @@ def adjust_with_indexing(self, params_or_path, **kwargs):
# 2.d Adjust with values greater than or equal to current
# year in params
if base_param in params:
vos = self.sel[params[base_param]]["year"].gte(
year, strict=False
)
vos = self.sel[params[base_param]]["year"].gte(year, strict=False)
super().adjust({base_param: vos}, **kwargs)

# 2.e Extend values through remaining years.
Expand Down

0 comments on commit 5bf975d

Please sign in to comment.