From 70424d1c4f284f776a53fd1d29de9fecbea6e5bd Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 27 Jan 2025 13:45:41 +0000 Subject: [PATCH] Remove clean_assets --- src/muse/agents/factories.py | 2 +- src/muse/hooks.py | 10 -- src/muse/utilities.py | 18 -- .../trade/Results/MCACapacity.csv | 21 +-- .../trade/Results/MCAPrices.csv | 168 +++++++++--------- tests/test_agents.py | 27 --- 6 files changed, 93 insertions(+), 153 deletions(-) diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py index b692a329a..925c17b81 100644 --- a/src/muse/agents/factories.py +++ b/src/muse/agents/factories.py @@ -275,7 +275,7 @@ def _shared_capacity( def _standardize_inputs( - housekeeping: str | Mapping | Callable = "clean", + housekeeping: str | Mapping | Callable = "noop", merge_transform: str | Mapping | Callable = "merge", objectives: Callable | str | Mapping | Sequence[str | Mapping] = "fixed_costs", decision: Callable | str | Mapping = "mean", diff --git a/src/muse/hooks.py b/src/muse/hooks.py index ef4f537fb..d9a139158 100644 --- a/src/muse/hooks.py +++ b/src/muse/hooks.py @@ -4,7 +4,6 @@ __all__ = [ "asset_merge_factory", - "clean", "housekeeping_factory", "merge_assets", "new_assets_only", @@ -128,15 +127,6 @@ def noop(agent: Agent, assets: Dataset) -> Dataset: return assets -@register_initial_asset_transform -def clean(agent: Agent, assets: Dataset) -> Dataset: - """Removes empty assets.""" - from muse.utilities import clean_assets - - years = [agent.year, agent.forecast_year] - return clean_assets(assets, years) - - @register_final_asset_transform(name="new") def new_assets_only(old_assets: Dataset, new_assets: Dataset) -> Dataset: """Returns newly invested assets and ignores old assets.""" diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 9459196f9..6a0919242 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -244,24 +244,6 @@ def broadcast_techs( return techs.sel(second_sel) -def clean_assets(assets: xr.Dataset, years: int | Sequence[int]): - """Cleans up and prepares asset for current iteration. - - - adds current and forecast year by backfilling missing entries - - removes assets for which there is no capacity now or in the future - """ - if isinstance(years, Sequence): - current = min(*years) - years = sorted(set(assets.year[assets.year >= current].values).union(years)) - else: - x = set(assets.year[assets.year >= years].values) - x.add(years) - years = sorted(x) - result = assets.reindex(year=years, method="backfill").fillna(0) - not_asset = [u for u in result.dims if u != "asset"] - return result.sel(asset=result.capacity.any(not_asset)) - - def filter_input( dataset: xr.Dataset | xr.DataArray, year: int | Iterable[int] | None = None, diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index e2e0b4a3f..b2d5f949d 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -5,27 +5,22 @@ A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020 A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020 A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020 A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020 -A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2025 -A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2025 -A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2025 +A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025 +A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2025 A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025 A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025 -A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2025 -A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2025 A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030 -A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2030 -A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2030 +A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2030 +A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2030 A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030 A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 -A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2035 -A1,444.15780000000,R1,2035,R1,residential,gasboiler,retrofit,2035 -A1,17.15000000000,R2,2010,R2,residential,gasboiler,retrofit,2035 -A1,1.63330000000,R2,2035,R2,residential,gasboiler,retrofit,2035 +A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2035 +A1,344.74380000000,R1,2035,R1,residential,gasboiler,retrofit,2035 +A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 +A1,18.78330000000,R2,2035,R2,residential,gasboiler,retrofit,2035 A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 -A1,1470.00000000000,R1,2010,R1,gas,gassupply1,agent,2035 -A1,490.00000000000,R2,2010,R2,gas,gassupply1,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 118984620..20cfa264b 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,night,all-year,151.33800000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.45190000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,213.58660000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,151.33800000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.45190000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,213.58660000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,151.33800000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.45190000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,213.58660000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,151.33800000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.45190000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,213.58660000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,151.33800000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.45190000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,213.58660000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,151.33800000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.45190000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,213.58660000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,200.49020000000,R2,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,night,all-year,297.19550000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,200.49020000000,R2,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,297.19550000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,200.49020000000,R2,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,297.19550000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,200.49020000000,R2,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,297.19550000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,200.49020000000,R2,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,297.19550000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,200.49020000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,297.19550000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,946.04720000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,946.04720000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,night,all-year,262.75220000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.45620000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,390.26630000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,946.04720000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,946.04720000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,262.75220000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.45620000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,390.26630000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,946.04720000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,946.04720000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,262.75220000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.45620000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,390.26630000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,946.04720000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,946.04720000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,262.75220000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.45620000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,390.26630000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,946.04720000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,946.04720000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,262.75220000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.45620000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,390.26630000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,946.04720000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,946.04720000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,262.75220000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.45620000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,390.26630000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_agents.py b/tests/test_agents.py index 6c6b96896..8cee9b7ec 100644 --- a/tests/test_agents.py +++ b/tests/test_agents.py @@ -168,33 +168,6 @@ def test_merge_assets(assets): assert (multi_actual == multi_assets).all() -def test_clean_assets(assets): - from numpy.random import choice - - from muse.utilities import clean_assets - - current_year = choice(range(assets.year.min().values, assets.year.max().values)) - iempties = assets.asset[range(0, len(assets.asset), 3)].asset - assets.capacity[:] = 1 - assets.capacity.loc[{"asset": iempties, "year": assets.year >= current_year}] = 0 - - cleaned = clean_assets(assets, current_year) - assert (cleaned.year >= current_year).all() - - # fmt: disable - empties = set( - zip( - assets.sel(asset=iempties).technology.values, - assets.sel(asset=iempties).installed.values, - ) - ) - # fmt: enable - cleanies = set(zip(cleaned.technology.values, cleaned.installed.values)) - originals = set(zip(assets.technology.values, assets.installed.values)) - assert empties.isdisjoint(cleanies) - assert empties.union(cleanies) == originals - - def test_initial_assets(tmp_path): from muse.examples import copy_model from muse.readers.csv import read_initial_assets