adjust valid_grouping_years
change sign, split up conditions for better readibility
This commit is contained in:
parent
17d44d7f64
commit
442c8a8c74
@ -461,12 +461,20 @@ def add_heating_capacities_installed_before_baseyear(
|
|||||||
efficiency = costs.at[costs_name, "efficiency"]
|
efficiency = costs.at[costs_name, "efficiency"]
|
||||||
|
|
||||||
valid_grouping_years = pd.Series(
|
valid_grouping_years = pd.Series(
|
||||||
[int(gy) for gy in grouping_years if
|
[
|
||||||
int(baseyear) - default_lifetime <= int(gy) < int(baseyear)])
|
int(grouping_year)
|
||||||
|
for grouping_year in grouping_years
|
||||||
|
if int(grouping_year) + default_lifetime > int(baseyear)
|
||||||
|
and int(grouping_year) < int(baseyear)
|
||||||
|
]
|
||||||
|
)
|
||||||
# Installation is assumed to be linear for the past
|
# Installation is assumed to be linear for the past
|
||||||
_intervals = pd.concat(
|
_intervals = (
|
||||||
[valid_grouping_years[1:], pd.Series(baseyear)],
|
pd.concat(
|
||||||
ignore_index=True) - valid_grouping_years
|
[valid_grouping_years[1:], pd.Series(baseyear)], ignore_index=True
|
||||||
|
)
|
||||||
|
- valid_grouping_years
|
||||||
|
)
|
||||||
ratios = _intervals / _intervals.sum()
|
ratios = _intervals / _intervals.sum()
|
||||||
|
|
||||||
for ratio, grouping_year in zip(ratios, valid_grouping_years):
|
for ratio, grouping_year in zip(ratios, valid_grouping_years):
|
||||||
|
Loading…
Reference in New Issue
Block a user