Skip to content

Commit caf4d29

Browse files
tsmblandtsmbland
committed
Update trade result
1 parent d5689ea commit caf4d29

2 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/muse/outputs/cache.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ def extract_agents_internal(
354354
info[aid]["category"] = agent.category
355355
info[aid]["sector"] = sector_name
356356
info[aid]["dst_region"] = agent.region
357-
info[aid]["year"] = agent.forecast_year
357+
info[aid]["year"] = agent.year
358358
info[aid]["installed"] = agent.year
359359

360360
return info

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -88,40 +88,40 @@ electricity,all-week,evening,all-year,31.00090000000,R2,5,MUS$2010/PJ,2030
8888
gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030
8989
gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030
9090
heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030
91-
heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030
91+
heat,all-week,evening,all-year,52.15770000000,R2,5,MUS$2010/PJ,2030
9292
electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035
93-
electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035
93+
electricity,all-week,night,all-year,213.38810000000,R2,0,MUS$2010/PJ,2035
9494
gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035
95-
gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035
95+
gas,all-week,night,all-year,109.06920000000,R2,0,MUS$2010/PJ,2035
9696
heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035
97-
heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035
97+
heat,all-week,night,all-year,97.02350000000,R2,0,MUS$2010/PJ,2035
9898
electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035
99-
electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035
99+
electricity,all-week,morning,all-year,213.38810000000,R2,1,MUS$2010/PJ,2035
100100
gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035
101-
gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035
101+
gas,all-week,morning,all-year,109.06920000000,R2,1,MUS$2010/PJ,2035
102102
heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035
103-
heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035
103+
heat,all-week,morning,all-year,97.02350000000,R2,1,MUS$2010/PJ,2035
104104
electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035
105-
electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035
105+
electricity,all-week,afternoon,all-year,213.38810000000,R2,2,MUS$2010/PJ,2035
106106
gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035
107-
gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035
107+
gas,all-week,afternoon,all-year,109.06920000000,R2,2,MUS$2010/PJ,2035
108108
heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035
109-
heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035
109+
heat,all-week,afternoon,all-year,97.02350000000,R2,2,MUS$2010/PJ,2035
110110
electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035
111-
electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035
111+
electricity,all-week,early-peak,all-year,213.38810000000,R2,3,MUS$2010/PJ,2035
112112
gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035
113-
gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035
113+
gas,all-week,early-peak,all-year,109.06920000000,R2,3,MUS$2010/PJ,2035
114114
heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035
115-
heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035
115+
heat,all-week,early-peak,all-year,97.02350000000,R2,3,MUS$2010/PJ,2035
116116
electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035
117-
electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035
117+
electricity,all-week,late-peak,all-year,213.38810000000,R2,4,MUS$2010/PJ,2035
118118
gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035
119-
gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035
119+
gas,all-week,late-peak,all-year,109.06920000000,R2,4,MUS$2010/PJ,2035
120120
heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035
121-
heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035
121+
heat,all-week,late-peak,all-year,97.02350000000,R2,4,MUS$2010/PJ,2035
122122
electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035
123-
electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035
123+
electricity,all-week,evening,all-year,213.38810000000,R2,5,MUS$2010/PJ,2035
124124
gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035
125-
gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035
125+
gas,all-week,evening,all-year,109.06920000000,R2,5,MUS$2010/PJ,2035
126126
heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035
127-
heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035
127+
heat,all-week,evening,all-year,97.02350000000,R2,5,MUS$2010/PJ,2035

0 commit comments

Comments
 (0)