Skip to content

Fix error in aggregate_enduses for subsector commodities #702

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

Closed
tsmbland wants to merge 1 commit into from
Closed

Fix error in aggregate_enduses for subsector commodities #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 6 additions & 19 deletions src/muse/sectors/subsector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@ def factory(
if hasattr(settings, "commodities"):
commodities = settings.commodities
else:
commodities = aggregate_enduses(
[agent.assets for agent in agents], technologies
)
commodities = aggregate_enduses(technologies)

# len(commodities) == 0 may happen only if
# we run only one region or all regions have no outputs
Expand Down Expand Up @@ -208,21 +206,10 @@ def factory(
)


def aggregate_enduses(
assets: Sequence[xr.Dataset | xr.DataArray], technologies: xr.Dataset
) -> Sequence[str]:
"""Aggregate enduse commodities for input assets.

This function is meant as a helper to figure out the commodities attached to a group
of agents.
"""
def aggregate_enduses(technologies: xr.Dataset) -> Sequence[str]:
"""Aggregate enduse commodities for a set of technologies."""
from muse.commodities import is_enduse

techs = set.union(*(set(data.technology.values) for data in assets))
outputs = technologies.fixed_outputs.sel(
commodity=is_enduse(technologies.comm_usage), technology=list(techs)
)

return outputs.commodity.sel(
commodity=outputs.any([u for u in outputs.dims if u != "commodity"])
).values.tolist()
return technologies.sel(
commodity=is_enduse(technologies.comm_usage)
).commodity.values.tolist()
6 changes: 2 additions & 4 deletions tests/test_subsector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ def test_subsector_investing_aggregation():
agents = list(examples.sector(sname, model).agents)
sector = next(sector for sector in mca.sectors if sector.name == sname)
technologies = sector.technologies
commodities = aggregate_enduses(
(agent.assets for agent in agents), technologies
)
commodities = aggregate_enduses(technologies)
market = mca.market.sel(
commodity=technologies.commodity, region=technologies.region
).interp(year=[2020, 2025])
Expand Down Expand Up @@ -89,7 +87,7 @@ def test_subsector_noninvesting_aggregation(market, model, technologies, tmp_pat
param["decision"]["parameters"] = ("ALCOE", False, 1)
param.pop("quantity")
agents = [create_agent(technologies=technologies, **param) for param in params]
commodities = aggregate_enduses((agent.assets for agent in agents), technologies)
commodities = aggregate_enduses(technologies)

subsector = Subsector(
agents,
Expand Down