bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

address pandas iteritems deprecation

Browse Source
This commit is contained in:
Fabian Neumann 2022-12-27 13:16:05 +01:00
parent 2aa67bdf9f
commit bb1b37e8ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/simplify_network.py
View File

@ -217,7 +217,7 @@ def _adjust_capital_costs_using_connection_costs(n, connection_costs_to_bus, out
tech, tech,
", ".join( ", ".join(
"{:.0f} Eur/MW/a for `{}`".format(d, b) "{:.0f} Eur/MW/a for `{}`".format(d, b)
for b, d in costs.iteritems() for b, d in costs.items()
), ),
) )
) )
@ -369,7 +369,7 @@ def simplify_links(n, costs, config, output, aggregation_strategies=dict()):
n.mremove("Link", all_links) n.mremove("Link", all_links)
static_attrs = n.components["Link"]["attrs"].loc[lambda df: df.static] static_attrs = n.components["Link"]["attrs"].loc[lambda df: df.static]
for attr, default in static_attrs.default.iteritems(): for attr, default in static_attrs.default.items():
params.setdefault(attr, default) params.setdefault(attr, default)
n.links.loc[name] = pd.Series(params) n.links.loc[name] = pd.Series(params)