Skip to content

Commit 9e80ec1

Browse files
tsmblandtsmbland
authored
Merge branch 'main' into remove_forecast
2 parents 0c196c0 + 0429239 commit 9e80ec1

File tree

28 files changed

+1207
-984
lines changed

28 files changed

+1207
-984
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: trailing-whitespace
1010
- id: end-of-file-fixer
1111
- repo: https://github.com/astral-sh/ruff-pre-commit
12-
rev: v0.9.3
12+
rev: v0.9.4
1313
hooks:
1414
- id: ruff-format
1515
types_or: [python, pyi, jupyter]
@@ -36,7 +36,7 @@ repos:
3636
- id: pretty-format-toml
3737
args: [--autofix, --indent, "4", --no-sort]
3838
- repo: https://github.com/codespell-project/codespell
39-
rev: v2.4.0
39+
rev: v2.4.1
4040
hooks:
4141
- id: codespell
4242
args: [--ignore-words, .codespell_ignore.txt]

‎.vscode/launch.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
"module": "muse",
1919
"args": ["--model", "default_retro"]
2020
},
21+
{
22+
"name": "Model: default_adhoc",
23+
"type": "debugpy",
24+
"request": "launch",
25+
"module": "muse",
26+
"args": ["--model", "default_adhoc"]
27+
},
2128
{
2229
"name": "Model: multiple_agents",
2330
"type": "debugpy",

‎docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv‎

Lines changed: 103 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,120 @@ A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
66
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
77
A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
88
A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
9-
A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025
9+
A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
1010
A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
11-
A1,19.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2025
11+
A1,19.00000000000,R2,2025,R2,residential,heatpump,newcapa,2025
1212
A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
13+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
14+
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
1315
A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
16+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2025
17+
A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2025
1418
A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
15-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2025
19+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
1620
A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2025
17-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2025
18-
A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
19-
A1,11.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2030
20-
A1,19.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030
21-
A1,11.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2030
21+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2025
22+
A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
23+
A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
24+
A1,10.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2030
25+
A1,19.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
26+
A1,1.00000000000,R2,2030,R2,residential,heatpump,newcapa,2030
27+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
28+
A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030
29+
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
30+
A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030
31+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2030
32+
A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2030
33+
A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2030
2234
A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
23-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2030
24-
A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2030
35+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
2536
A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
26-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2030
27-
A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2030
28-
A1,11.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035
37+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2030
38+
A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2030
39+
A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
2940
A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
30-
A1,11.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035
31-
A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035
32-
A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035
33-
A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2035
34-
A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2035
35-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035
36-
A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
37-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2035
38-
A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2035
41+
A1,10.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035
42+
A1,6.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035
43+
A1,1.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
44+
A1,19.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035
45+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
46+
A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035
47+
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
48+
A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035
49+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
50+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2035
51+
A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2035
52+
A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2035
53+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
54+
A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035
55+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2035
56+
A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2035
57+
A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2035
3958
A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
4059
A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
41-
A1,5.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040
42-
A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040
43-
A1,20.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
44-
A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
45-
A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2040
46-
A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2040
47-
A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2040
48-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040
49-
A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
50-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2040
51-
A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2040
60+
A1,6.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040
61+
A1,16.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040
62+
A1,19.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
63+
A1,1.00000000000,R2,2040,R2,residential,heatpump,newcapa,2040
64+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
65+
A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040
66+
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
67+
A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040
68+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
69+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
70+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2040
71+
A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2040
72+
A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2040
73+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
74+
A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040
75+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2040
76+
A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2040
77+
A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2040
78+
A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2040
5279
A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
5380
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
54-
A1,17.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045
55-
A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045
56-
A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045
57-
A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
58-
A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
59-
A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
60-
A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2045
61-
A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2045
62-
A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2045
63-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045
64-
A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
65-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2045
66-
A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2045
81+
A1,16.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045
82+
A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045
83+
A1,1.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
84+
A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045
85+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
86+
A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045
87+
A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
88+
A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045
89+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
90+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
91+
A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
92+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2045
93+
A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2045
94+
A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2045
95+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
96+
A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045
97+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2045
98+
A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045
99+
A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045
100+
A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045
101+
A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045
67102
A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
68103
A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
69-
A1,11.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050
70-
A1,23.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050
71-
A1,20.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
72-
A1,22.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
73-
A1,8.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
74-
A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
75-
A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
76-
A1,22.50000000000,R2,2035,R2,power,windturbine,newcapa,2050
77-
A1,8.50000000000,R2,2040,R2,power,windturbine,newcapa,2050
78-
A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050
79-
A1,3.00000000000,R2,2050,R2,power,windturbine,newcapa,2050
80-
A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050
81-
A1,15.23330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
82-
A1,15.93330000000,R2,2025,R2,gas,gassupply1,newcapa,2050
83-
A1,15.23330000000,R2,2030,R2,gas,gassupply1,newcapa,2050
104+
A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050
105+
A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050
106+
A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
107+
A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050
108+
A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
109+
A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050
110+
A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050
111+
A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
112+
A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
113+
A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
114+
A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
115+
A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050
116+
A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050
117+
A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050
118+
A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
119+
A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050
120+
A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050
121+
A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050
122+
A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050
123+
A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050
124+
A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050
125+
A1,7.73330000000,R2,2050,R2,gas,gassupply1,newcapa,2050

0 commit comments

Comments
 (0)