Skip to content

Commit 70424d1

Browse files
tsmblandtsmbland
committed
Remove clean_assets
1 parent 6fe3ebe commit 70424d1

6 files changed

Lines changed: 93 additions & 153 deletions

File tree

‎src/muse/agents/factories.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def _shared_capacity(
275275

276276

277277
def _standardize_inputs(
278-
housekeeping: str | Mapping | Callable = "clean",
278+
housekeeping: str | Mapping | Callable = "noop",
279279
merge_transform: str | Mapping | Callable = "merge",
280280
objectives: Callable | str | Mapping | Sequence[str | Mapping] = "fixed_costs",
281281
decision: Callable | str | Mapping = "mean",

‎src/muse/hooks.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
__all__ = [
66
"asset_merge_factory",
7-
"clean",
87
"housekeeping_factory",
98
"merge_assets",
109
"new_assets_only",
@@ -128,15 +127,6 @@ def noop(agent: Agent, assets: Dataset) -> Dataset:
128127
return assets
129128

130129

131-
@register_initial_asset_transform
132-
def clean(agent: Agent, assets: Dataset) -> Dataset:
133-
"""Removes empty assets."""
134-
from muse.utilities import clean_assets
135-
136-
years = [agent.year, agent.forecast_year]
137-
return clean_assets(assets, years)
138-
139-
140130
@register_final_asset_transform(name="new")
141131
def new_assets_only(old_assets: Dataset, new_assets: Dataset) -> Dataset:
142132
"""Returns newly invested assets and ignores old assets."""

‎src/muse/utilities.py‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -244,24 +244,6 @@ def broadcast_techs(
244244
return techs.sel(second_sel)
245245

246246

247-
def clean_assets(assets: xr.Dataset, years: int | Sequence[int]):
248-
"""Cleans up and prepares asset for current iteration.
249-
250-
- adds current and forecast year by backfilling missing entries
251-
- removes assets for which there is no capacity now or in the future
252-
"""
253-
if isinstance(years, Sequence):
254-
current = min(*years)
255-
years = sorted(set(assets.year[assets.year >= current].values).union(years))
256-
else:
257-
x = set(assets.year[assets.year >= years].values)
258-
x.add(years)
259-
years = sorted(x)
260-
result = assets.reindex(year=years, method="backfill").fillna(0)
261-
not_asset = [u for u in result.dims if u != "asset"]
262-
return result.sel(asset=result.capacity.any(not_asset))
263-
264-
265247
def filter_input(
266248
dataset: xr.Dataset | xr.DataArray,
267249
year: int | Iterable[int] | None = None,

‎tests/example_outputs/trade/Results/MCACapacity.csv‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,22 @@ A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020
55
A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020
66
A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020
77
A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020
8-
A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2025
9-
A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2025
10-
A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2025
8+
A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025
9+
A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2025
1110
A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025
1211
A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025
13-
A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2025
14-
A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2025
1512
A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030
16-
A1,355.93470000000,R1,2025,R1,residential,gasboiler,retrofit,2030
17-
A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2030
13+
A1,256.52070000000,R1,2025,R1,residential,gasboiler,retrofit,2030
14+
A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2030
1815
A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030
1916
A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030
2017
A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030
2118
A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030
2219
A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030
2320
A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035
24-
A1,74.53330000000,R1,2030,R1,residential,gasboiler,retrofit,2035
25-
A1,444.15780000000,R1,2035,R1,residential,gasboiler,retrofit,2035
26-
A1,17.15000000000,R2,2010,R2,residential,gasboiler,retrofit,2035
27-
A1,1.63330000000,R2,2035,R2,residential,gasboiler,retrofit,2035
21+
A1,173.94730000000,R1,2030,R1,residential,gasboiler,retrofit,2035
22+
A1,344.74380000000,R1,2035,R1,residential,gasboiler,retrofit,2035
23+
A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035
24+
A1,18.78330000000,R2,2035,R2,residential,gasboiler,retrofit,2035
2825
A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035
2926
A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035
30-
A1,1470.00000000000,R1,2010,R1,gas,gassupply1,agent,2035
31-
A1,490.00000000000,R2,2010,R2,gas,gassupply1,agent,2035

‎tests/example_outputs/trade/Results/MCAPrices.csv‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020
2323
electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020
2424
gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020
2525
gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020
26-
electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025
27-
electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025
26+
electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2025
27+
electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2025
2828
gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025
29-
gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025
30-
heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025
31-
heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025
32-
electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025
33-
electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025
29+
gas,all-week,night,all-year,151.33800000000,R2,0,MUS$2010/PJ,2025
30+
heat,all-week,night,all-year,21.45190000000,R1,0,MUS$2010/PJ,2025
31+
heat,all-week,night,all-year,213.58660000000,R2,0,MUS$2010/PJ,2025
32+
electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2025
33+
electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2025
3434
gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025
35-
gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025
36-
heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025
37-
heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025
38-
electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025
39-
electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025
35+
gas,all-week,morning,all-year,151.33800000000,R2,1,MUS$2010/PJ,2025
36+
heat,all-week,morning,all-year,21.45190000000,R1,1,MUS$2010/PJ,2025
37+
heat,all-week,morning,all-year,213.58660000000,R2,1,MUS$2010/PJ,2025
38+
electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2025
39+
electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2025
4040
gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025
41-
gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025
42-
heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025
43-
heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025
44-
electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025
45-
electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025
41+
gas,all-week,afternoon,all-year,151.33800000000,R2,2,MUS$2010/PJ,2025
42+
heat,all-week,afternoon,all-year,21.45190000000,R1,2,MUS$2010/PJ,2025
43+
heat,all-week,afternoon,all-year,213.58660000000,R2,2,MUS$2010/PJ,2025
44+
electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2025
45+
electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2025
4646
gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025
47-
gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025
48-
heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025
49-
heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025
50-
electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025
51-
electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025
47+
gas,all-week,early-peak,all-year,151.33800000000,R2,3,MUS$2010/PJ,2025
48+
heat,all-week,early-peak,all-year,21.45190000000,R1,3,MUS$2010/PJ,2025
49+
heat,all-week,early-peak,all-year,213.58660000000,R2,3,MUS$2010/PJ,2025
50+
electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2025
51+
electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2025
5252
gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025
53-
gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025
54-
heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025
55-
heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025
56-
electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025
57-
electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025
53+
gas,all-week,late-peak,all-year,151.33800000000,R2,4,MUS$2010/PJ,2025
54+
heat,all-week,late-peak,all-year,21.45190000000,R1,4,MUS$2010/PJ,2025
55+
heat,all-week,late-peak,all-year,213.58660000000,R2,4,MUS$2010/PJ,2025
56+
electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2025
57+
electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2025
5858
gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025
59-
gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025
60-
heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025
61-
heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025
62-
electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030
63-
electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030
59+
gas,all-week,evening,all-year,151.33800000000,R2,5,MUS$2010/PJ,2025
60+
heat,all-week,evening,all-year,21.45190000000,R1,5,MUS$2010/PJ,2025
61+
heat,all-week,evening,all-year,213.58660000000,R2,5,MUS$2010/PJ,2025
62+
electricity,all-week,night,all-year,150.90120000000,R1,0,MUS$2010/PJ,2030
63+
electricity,all-week,night,all-year,150.90120000000,R2,0,MUS$2010/PJ,2030
6464
gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030
65-
gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030
65+
gas,all-week,night,all-year,200.49020000000,R2,0,MUS$2010/PJ,2030
6666
heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030
67-
heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030
68-
electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030
69-
electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030
67+
heat,all-week,night,all-year,297.19550000000,R2,0,MUS$2010/PJ,2030
68+
electricity,all-week,morning,all-year,150.90120000000,R1,1,MUS$2010/PJ,2030
69+
electricity,all-week,morning,all-year,150.90120000000,R2,1,MUS$2010/PJ,2030
7070
gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030
71-
gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030
71+
gas,all-week,morning,all-year,200.49020000000,R2,1,MUS$2010/PJ,2030
7272
heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030
73-
heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030
74-
electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030
75-
electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030
73+
heat,all-week,morning,all-year,297.19550000000,R2,1,MUS$2010/PJ,2030
74+
electricity,all-week,afternoon,all-year,150.90120000000,R1,2,MUS$2010/PJ,2030
75+
electricity,all-week,afternoon,all-year,150.90120000000,R2,2,MUS$2010/PJ,2030
7676
gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030
77-
gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030
77+
gas,all-week,afternoon,all-year,200.49020000000,R2,2,MUS$2010/PJ,2030
7878
heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030
79-
heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030
80-
electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030
81-
electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030
79+
heat,all-week,afternoon,all-year,297.19550000000,R2,2,MUS$2010/PJ,2030
80+
electricity,all-week,early-peak,all-year,150.90120000000,R1,3,MUS$2010/PJ,2030
81+
electricity,all-week,early-peak,all-year,150.90120000000,R2,3,MUS$2010/PJ,2030
8282
gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030
83-
gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030
83+
gas,all-week,early-peak,all-year,200.49020000000,R2,3,MUS$2010/PJ,2030
8484
heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030
85-
heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030
86-
electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030
87-
electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030
85+
heat,all-week,early-peak,all-year,297.19550000000,R2,3,MUS$2010/PJ,2030
86+
electricity,all-week,late-peak,all-year,150.90120000000,R1,4,MUS$2010/PJ,2030
87+
electricity,all-week,late-peak,all-year,150.90120000000,R2,4,MUS$2010/PJ,2030
8888
gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030
89-
gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030
89+
gas,all-week,late-peak,all-year,200.49020000000,R2,4,MUS$2010/PJ,2030
9090
heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030
91-
heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030
92-
electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030
93-
electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030
91+
heat,all-week,late-peak,all-year,297.19550000000,R2,4,MUS$2010/PJ,2030
92+
electricity,all-week,evening,all-year,150.90120000000,R1,5,MUS$2010/PJ,2030
93+
electricity,all-week,evening,all-year,150.90120000000,R2,5,MUS$2010/PJ,2030
9494
gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030
95-
gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030
95+
gas,all-week,evening,all-year,200.49020000000,R2,5,MUS$2010/PJ,2030
9696
heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030
97-
heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030
98-
electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035
99-
electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035
97+
heat,all-week,evening,all-year,297.19550000000,R2,5,MUS$2010/PJ,2030
98+
electricity,all-week,night,all-year,946.04720000000,R1,0,MUS$2010/PJ,2035
99+
electricity,all-week,night,all-year,946.04720000000,R2,0,MUS$2010/PJ,2035
100100
gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035
101-
gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035
102-
heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035
103-
heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035
104-
electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035
105-
electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035
101+
gas,all-week,night,all-year,262.75220000000,R2,0,MUS$2010/PJ,2035
102+
heat,all-week,night,all-year,45.45620000000,R1,0,MUS$2010/PJ,2035
103+
heat,all-week,night,all-year,390.26630000000,R2,0,MUS$2010/PJ,2035
104+
electricity,all-week,morning,all-year,946.04720000000,R1,1,MUS$2010/PJ,2035
105+
electricity,all-week,morning,all-year,946.04720000000,R2,1,MUS$2010/PJ,2035
106106
gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035
107-
gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035
108-
heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035
109-
heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035
110-
electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035
111-
electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035
107+
gas,all-week,morning,all-year,262.75220000000,R2,1,MUS$2010/PJ,2035
108+
heat,all-week,morning,all-year,45.45620000000,R1,1,MUS$2010/PJ,2035
109+
heat,all-week,morning,all-year,390.26630000000,R2,1,MUS$2010/PJ,2035
110+
electricity,all-week,afternoon,all-year,946.04720000000,R1,2,MUS$2010/PJ,2035
111+
electricity,all-week,afternoon,all-year,946.04720000000,R2,2,MUS$2010/PJ,2035
112112
gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035
113-
gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035
114-
heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035
115-
heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035
116-
electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035
117-
electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035
113+
gas,all-week,afternoon,all-year,262.75220000000,R2,2,MUS$2010/PJ,2035
114+
heat,all-week,afternoon,all-year,45.45620000000,R1,2,MUS$2010/PJ,2035
115+
heat,all-week,afternoon,all-year,390.26630000000,R2,2,MUS$2010/PJ,2035
116+
electricity,all-week,early-peak,all-year,946.04720000000,R1,3,MUS$2010/PJ,2035
117+
electricity,all-week,early-peak,all-year,946.04720000000,R2,3,MUS$2010/PJ,2035
118118
gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035
119-
gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035
120-
heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035
121-
heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035
122-
electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035
123-
electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035
119+
gas,all-week,early-peak,all-year,262.75220000000,R2,3,MUS$2010/PJ,2035
120+
heat,all-week,early-peak,all-year,45.45620000000,R1,3,MUS$2010/PJ,2035
121+
heat,all-week,early-peak,all-year,390.26630000000,R2,3,MUS$2010/PJ,2035
122+
electricity,all-week,late-peak,all-year,946.04720000000,R1,4,MUS$2010/PJ,2035
123+
electricity,all-week,late-peak,all-year,946.04720000000,R2,4,MUS$2010/PJ,2035
124124
gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035
125-
gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035
126-
heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035
127-
heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035
128-
electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035
129-
electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035
125+
gas,all-week,late-peak,all-year,262.75220000000,R2,4,MUS$2010/PJ,2035
126+
heat,all-week,late-peak,all-year,45.45620000000,R1,4,MUS$2010/PJ,2035
127+
heat,all-week,late-peak,all-year,390.26630000000,R2,4,MUS$2010/PJ,2035
128+
electricity,all-week,evening,all-year,946.04720000000,R1,5,MUS$2010/PJ,2035
129+
electricity,all-week,evening,all-year,946.04720000000,R2,5,MUS$2010/PJ,2035
130130
gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035
131-
gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035
132-
heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035
133-
heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035
131+
gas,all-week,evening,all-year,262.75220000000,R2,5,MUS$2010/PJ,2035
132+
heat,all-week,evening,all-year,45.45620000000,R1,5,MUS$2010/PJ,2035
133+
heat,all-week,evening,all-year,390.26630000000,R2,5,MUS$2010/PJ,2035

‎tests/test_agents.py‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -168,33 +168,6 @@ def test_merge_assets(assets):
168168
assert (multi_actual == multi_assets).all()
169169

170170

171-
def test_clean_assets(assets):
172-
from numpy.random import choice
173-
174-
from muse.utilities import clean_assets
175-
176-
current_year = choice(range(assets.year.min().values, assets.year.max().values))
177-
iempties = assets.asset[range(0, len(assets.asset), 3)].asset
178-
assets.capacity[:] = 1
179-
assets.capacity.loc[{"asset": iempties, "year": assets.year >= current_year}] = 0
180-
181-
cleaned = clean_assets(assets, current_year)
182-
assert (cleaned.year >= current_year).all()
183-
184-
# fmt: disable
185-
empties = set(
186-
zip(
187-
assets.sel(asset=iempties).technology.values,
188-
assets.sel(asset=iempties).installed.values,
189-
)
190-
)
191-
# fmt: enable
192-
cleanies = set(zip(cleaned.technology.values, cleaned.installed.values))
193-
originals = set(zip(assets.technology.values, assets.installed.values))
194-
assert empties.isdisjoint(cleanies)
195-
assert empties.union(cleanies) == originals
196-
197-
198171
def test_initial_assets(tmp_path):
199172
from muse.examples import copy_model
200173
from muse.readers.csv import read_initial_assets

0 commit comments

Comments
 (0)