Skip to content

Commit 3e8b2f1

Browse files
tsmblandtsmbland
authored
Merge branch 'develop' into new-data-input
2 parents f5bec10 + 205c500 commit 3e8b2f1

101 files changed

Lines changed: 3123 additions & 2077 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bumpversion.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.2.0rc1
2+
current_version = 1.2.0rc3
33
commit = True
44
tag = True
55

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
--cov-report=xml
4141
4242
- name: Upload coverage to Codecov
43-
if: success() && (runner.os == 'Linux' && matrix.python-version == 3.9)
43+
if: success() && (github.event_name == 'push' && runner.os == 'Linux' && matrix.python-version == 3.9)
4444
uses: codecov/codecov-action@v4
4545
with:
4646
fail_ci_if_error: true

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Publishing
22

3-
on: [release]
3+
on:
4+
release:
5+
types: [published]
46

57
jobs:
68
test:

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ authors:
99
given-names: Adam
1010

1111
title: MUSE_OS
12-
version: v1.2.0rc1
13-
date-released: 2024-07-29
12+
version: v1.2.0rc3
13+
date-released: 2024-08-13

‎docs/advanced-guide/extending-muse.ipynb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
"def consumption_zero(\n",
100100
" market: Dataset,\n",
101101
" capacity: DataArray,\n",
102-
" technologies: Dataset,\n",
103102
"):\n",
104103
" \"\"\"Current consumption.\"\"\"\n",
105104
" result = (\n",
@@ -451,7 +450,6 @@
451450
"def consumption_zero( # noqa: F811\n",
452451
" market: Dataset,\n",
453452
" capacity: DataArray,\n",
454-
" technologies: Dataset,\n",
455453
" sum_over: Optional[list[str]] = None,\n",
456454
" drop: Optional[list[str]] = None,\n",
457455
" rounding: int = 4,\n",

‎docs/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
project = "MUSE"
99
copyright = "2024, Imperial College London"
1010
author = "Imperial College London"
11-
release = "1.2.0rc1"
11+
release = "1.2.0rc3"
1212
version = ".".join(release.split(".")[:2])
1313

1414
# -- General configuration ---------------------------------------------------

‎docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2020.csv‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.77330000000
4-
0,2030,R1,gassupply1,2020,10.27330000000
5-
0,2035,R1,gassupply1,2020,2.77330000000
6-
0,2040,R1,gassupply1,2020,2.77330000000
7-
0,2045,R1,gassupply1,2020,2.77330000000
8-
0,2050,R1,gassupply1,2020,2.77330000000
9-
0,2059,R1,gassupply1,2020,2.77330000000
3+
0,2025,R1,gassupply1,2020,18.38780000000
4+
0,2030,R1,gassupply1,2020,10.88780000000
5+
0,2035,R1,gassupply1,2020,3.38780000000
6+
0,2040,R1,gassupply1,2020,3.38780000000
7+
0,2045,R1,gassupply1,2020,3.38780000000
8+
0,2050,R1,gassupply1,2020,3.38780000000
9+
0,2059,R1,gassupply1,2020,3.38780000000

‎docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2025.csv‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.77330000000
4-
0,2030,R1,gassupply1,2020,10.27330000000
5-
0,2035,R1,gassupply1,2020,2.77330000000
6-
0,2040,R1,gassupply1,2020,2.77330000000
7-
0,2045,R1,gassupply1,2020,2.77330000000
8-
0,2050,R1,gassupply1,2020,2.77330000000
9-
0,2059,R1,gassupply1,2020,2.77330000000
10-
1,2030,R1,gassupply1,2025,11.99330000000
11-
1,2035,R1,gassupply1,2025,11.99330000000
12-
1,2040,R1,gassupply1,2025,11.99330000000
13-
1,2045,R1,gassupply1,2025,11.99330000000
14-
1,2050,R1,gassupply1,2025,11.99330000000
15-
1,2059,R1,gassupply1,2025,11.99330000000
16-
1,2060,R1,gassupply1,2025,11.99330000000
17-
1,2064,R1,gassupply1,2025,11.99330000000
3+
0,2025,R1,gassupply1,2020,18.38780000000
4+
0,2030,R1,gassupply1,2020,10.88780000000
5+
0,2035,R1,gassupply1,2020,3.38780000000
6+
0,2040,R1,gassupply1,2020,3.38780000000
7+
0,2045,R1,gassupply1,2020,3.38780000000
8+
0,2050,R1,gassupply1,2020,3.38780000000
9+
0,2059,R1,gassupply1,2020,3.38780000000
10+
1,2030,R1,gassupply1,2025,12.17660000000
11+
1,2035,R1,gassupply1,2025,12.17660000000
12+
1,2040,R1,gassupply1,2025,12.17660000000
13+
1,2045,R1,gassupply1,2025,12.17660000000
14+
1,2050,R1,gassupply1,2025,12.17660000000
15+
1,2059,R1,gassupply1,2025,12.17660000000
16+
1,2060,R1,gassupply1,2025,12.17660000000
17+
1,2064,R1,gassupply1,2025,12.17660000000

‎docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2030.csv‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.77330000000
4-
0,2030,R1,gassupply1,2020,10.27330000000
5-
0,2035,R1,gassupply1,2020,2.77330000000
6-
0,2040,R1,gassupply1,2020,2.77330000000
7-
0,2045,R1,gassupply1,2020,2.77330000000
8-
0,2050,R1,gassupply1,2020,2.77330000000
9-
0,2059,R1,gassupply1,2020,2.77330000000
10-
1,2030,R1,gassupply1,2025,11.99330000000
11-
1,2035,R1,gassupply1,2025,11.99330000000
12-
1,2040,R1,gassupply1,2025,11.99330000000
13-
1,2045,R1,gassupply1,2025,11.99330000000
14-
1,2050,R1,gassupply1,2025,11.99330000000
15-
1,2059,R1,gassupply1,2025,11.99330000000
16-
1,2060,R1,gassupply1,2025,11.99330000000
17-
1,2064,R1,gassupply1,2025,11.99330000000
18-
2,2035,R1,gassupply1,2030,9.52420000000
19-
2,2040,R1,gassupply1,2030,9.52420000000
20-
2,2045,R1,gassupply1,2030,9.52420000000
21-
2,2050,R1,gassupply1,2030,9.52420000000
22-
2,2059,R1,gassupply1,2030,9.52420000000
23-
2,2060,R1,gassupply1,2030,9.52420000000
24-
2,2064,R1,gassupply1,2030,9.52420000000
25-
2,2065,R1,gassupply1,2030,9.52420000000
26-
2,2069,R1,gassupply1,2030,9.52420000000
3+
0,2025,R1,gassupply1,2020,18.38780000000
4+
0,2030,R1,gassupply1,2020,10.88780000000
5+
0,2035,R1,gassupply1,2020,3.38780000000
6+
0,2040,R1,gassupply1,2020,3.38780000000
7+
0,2045,R1,gassupply1,2020,3.38780000000
8+
0,2050,R1,gassupply1,2020,3.38780000000
9+
0,2059,R1,gassupply1,2020,3.38780000000
10+
1,2030,R1,gassupply1,2025,12.17660000000
11+
1,2035,R1,gassupply1,2025,12.17660000000
12+
1,2040,R1,gassupply1,2025,12.17660000000
13+
1,2045,R1,gassupply1,2025,12.17660000000
14+
1,2050,R1,gassupply1,2025,12.17660000000
15+
1,2059,R1,gassupply1,2025,12.17660000000
16+
1,2060,R1,gassupply1,2025,12.17660000000
17+
1,2064,R1,gassupply1,2025,12.17660000000
18+
2,2035,R1,gassupply1,2030,14.17140000000
19+
2,2040,R1,gassupply1,2030,14.17140000000
20+
2,2045,R1,gassupply1,2030,14.17140000000
21+
2,2050,R1,gassupply1,2030,14.17140000000
22+
2,2059,R1,gassupply1,2030,14.17140000000
23+
2,2060,R1,gassupply1,2030,14.17140000000
24+
2,2064,R1,gassupply1,2030,14.17140000000
25+
2,2065,R1,gassupply1,2030,14.17140000000
26+
2,2069,R1,gassupply1,2030,14.17140000000

‎docs/tutorial-code/2-add-agent/1-single-objective/Results/Gas/Capacity/2035.csv‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
asset,year,region,technology,installed,capacity
22
0,2020,R1,gassupply1,2020,15.00000000000
3-
0,2025,R1,gassupply1,2020,17.77330000000
4-
0,2030,R1,gassupply1,2020,10.27330000000
5-
0,2035,R1,gassupply1,2020,2.77330000000
6-
0,2040,R1,gassupply1,2020,2.77330000000
7-
0,2045,R1,gassupply1,2020,2.77330000000
8-
0,2050,R1,gassupply1,2020,2.77330000000
9-
0,2059,R1,gassupply1,2020,2.77330000000
10-
1,2030,R1,gassupply1,2025,11.99330000000
11-
1,2035,R1,gassupply1,2025,11.99330000000
12-
1,2040,R1,gassupply1,2025,11.99330000000
13-
1,2045,R1,gassupply1,2025,11.99330000000
14-
1,2050,R1,gassupply1,2025,11.99330000000
15-
1,2059,R1,gassupply1,2025,11.99330000000
16-
1,2060,R1,gassupply1,2025,11.99330000000
17-
1,2064,R1,gassupply1,2025,11.99330000000
18-
2,2035,R1,gassupply1,2030,9.52420000000
19-
2,2040,R1,gassupply1,2030,9.52420000000
20-
2,2045,R1,gassupply1,2030,9.52420000000
21-
2,2050,R1,gassupply1,2030,9.52420000000
22-
2,2059,R1,gassupply1,2030,9.52420000000
23-
2,2060,R1,gassupply1,2030,9.52420000000
24-
2,2064,R1,gassupply1,2030,9.52420000000
25-
2,2065,R1,gassupply1,2030,9.52420000000
26-
2,2069,R1,gassupply1,2030,9.52420000000
3+
0,2025,R1,gassupply1,2020,18.38780000000
4+
0,2030,R1,gassupply1,2020,10.88780000000
5+
0,2035,R1,gassupply1,2020,3.38780000000
6+
0,2040,R1,gassupply1,2020,3.38780000000
7+
0,2045,R1,gassupply1,2020,3.38780000000
8+
0,2050,R1,gassupply1,2020,3.38780000000
9+
0,2059,R1,gassupply1,2020,3.38780000000
10+
1,2030,R1,gassupply1,2025,12.17660000000
11+
1,2035,R1,gassupply1,2025,12.17660000000
12+
1,2040,R1,gassupply1,2025,12.17660000000
13+
1,2045,R1,gassupply1,2025,12.17660000000
14+
1,2050,R1,gassupply1,2025,12.17660000000
15+
1,2059,R1,gassupply1,2025,12.17660000000
16+
1,2060,R1,gassupply1,2025,12.17660000000
17+
1,2064,R1,gassupply1,2025,12.17660000000
18+
2,2035,R1,gassupply1,2030,14.17140000000
19+
2,2040,R1,gassupply1,2030,14.17140000000
20+
2,2045,R1,gassupply1,2030,14.17140000000
21+
2,2050,R1,gassupply1,2030,14.17140000000
22+
2,2059,R1,gassupply1,2030,14.17140000000
23+
2,2060,R1,gassupply1,2030,14.17140000000
24+
2,2064,R1,gassupply1,2030,14.17140000000
25+
2,2065,R1,gassupply1,2030,14.17140000000
26+
2,2069,R1,gassupply1,2030,14.17140000000
27+
3,2040,R1,gassupply1,2035,2.23740000000
28+
3,2045,R1,gassupply1,2035,2.23740000000
29+
3,2050,R1,gassupply1,2035,2.23740000000
30+
3,2059,R1,gassupply1,2035,2.23740000000
31+
3,2060,R1,gassupply1,2035,2.23740000000
32+
3,2064,R1,gassupply1,2035,2.23740000000
33+
3,2065,R1,gassupply1,2035,2.23740000000
34+
3,2069,R1,gassupply1,2035,2.23740000000
35+
3,2070,R1,gassupply1,2035,2.23740000000
36+
3,2074,R1,gassupply1,2035,2.23740000000

0 commit comments

Comments
 (0)