Skip to content

Commit b47973b

Browse files
tsmblandtsmbland
authored
Merge pull request #312 from EnergySystemsModellingLab/documentation
Update tutorial notebook text
2 parents 7c8036c + cb3bd87 commit b47973b

400 files changed

Lines changed: 18416 additions & 18611 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
"name": "python",
670670
"nbconvert_exporter": "python",
671671
"pygments_lexer": "ipython3",
672-
"version": "3.9.18"
672+
"version": "3.12.3"
673673
},
674674
"vscode": {
675675
"interpreter": {

‎docs/example-output.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"name": "python",
3434
"nbconvert_exporter": "python",
3535
"pygments_lexer": "ipython3",
36-
"version": "3.8.3"
36+
"version": "3.9.18"
3737
}
3838
},
3939
"nbformat": 4,

‎docs/inputs/technodata.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ Agent_0, ..., Agent_N
154154
In a two-agent simulation, a new column needs to be added for each retrofit agent belonging to the new-retrofit agent pair.
155155
The column heading refers each retrofit agent "AgentShare" as defined in the agents' definition (see :ref:`inputs-agents`).
156156
Assuming a split of the initial capacity into 30 \% and 70 \% for each retrofit agent, the model table would be setup as follows.
157-
The values of the "AgetnShare" needs to reflect the demand split represented by the "Quantity" attribute (see :ref:`inputs-agents`),
157+
The values of the "AgentShare" needs to reflect the demand split represented by the "Quantity" attribute (see :ref:`inputs-agents`),
158158
to make sure that the initial demand is fulfilled with the initial stock.
159159

160160
.. csv-table:: Techno-data: AgentShare - 2 agents

‎docs/running-muse-example.ipynb‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
"metadata": {},
157157
"outputs": [],
158158
"source": [
159+
"import matplotlib.pyplot as plt\n",
159160
"import pandas as pd"
160161
]
161162
},
@@ -191,14 +192,20 @@
191192
"metadata": {},
192193
"outputs": [],
193194
"source": [
194-
"for sector_name, sector_data in mca_capacity.groupby(\"sector\"):\n",
195+
"fig, axes = plt.subplots(1, 3)\n",
196+
"for ax, (sector_name, sector_data) in zip(axes, mca_capacity.groupby(\"sector\")):\n",
195197
" sector_capacity = sector_data.groupby([\"year\", \"technology\"]).sum().reset_index()\n",
196-
" ax = sector_capacity.pivot(\n",
197-
" index=\"year\", columns=\"technology\", values=\"capacity\"\n",
198-
" ).plot(kind=\"bar\", stacked=True)\n",
199-
" ax.set_title(\"{} Sector\".format(sector_name.capitalize()))\n",
198+
" sector_capacity.pivot(index=\"year\", columns=\"technology\", values=\"capacity\").plot(\n",
199+
" kind=\"bar\", stacked=True, ax=ax\n",
200+
" )\n",
200201
" ax.set_ylabel(\"Capacity (PJ)\")\n",
201-
" ax.tick_params(axis=\"x\", labelrotation=0)"
202+
" ax.set_xlabel(\"Year\")\n",
203+
" ax.set_title(f\"{sector_name.capitalize()} Sector:\", fontsize=10)\n",
204+
" ax.legend(title=None, prop={\"size\": 8})\n",
205+
" ax.tick_params(axis=\"both\", labelsize=8)\n",
206+
"\n",
207+
"fig.set_size_inches(8, 2.5)\n",
208+
"fig.subplots_adjust(wspace=0.5)"
202209
]
203210
},
204211
{
@@ -236,7 +243,7 @@
236243
"name": "python",
237244
"nbconvert_exporter": "python",
238245
"pygments_lexer": "ipython3",
239-
"version": "3.9.18"
246+
"version": "3.12.3"
240247
}
241248
},
242249
"nbformat": 4,

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2025.csv‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
asset,year,region,technology,installed,capacity
22
0,2025,R1,gassupply1,2020,15.00000000000
33
0,2030,R1,gassupply1,2020,7.50000000000
4-
1,2030,R1,gassupply1,2025,2.79440000000
5-
1,2035,R1,gassupply1,2025,2.79440000000
6-
1,2040,R1,gassupply1,2025,2.79440000000
7-
1,2045,R1,gassupply1,2025,2.79440000000
8-
1,2050,R1,gassupply1,2025,2.79440000000
9-
1,2064,R1,gassupply1,2025,2.79440000000

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
asset,year,region,technology,installed,capacity
22
0,2030,R1,gassupply1,2020,7.50000000000
3-
1,2030,R1,gassupply1,2025,2.79440000000
4-
1,2035,R1,gassupply1,2025,2.79440000000
5-
1,2040,R1,gassupply1,2025,2.79440000000
6-
1,2045,R1,gassupply1,2025,2.79440000000
7-
1,2050,R1,gassupply1,2025,2.79440000000
8-
1,2064,R1,gassupply1,2025,2.79440000000
9-
2,2035,R1,gassupply1,2030,7.50000000000
10-
2,2040,R1,gassupply1,2030,7.50000000000
11-
2,2045,R1,gassupply1,2030,7.50000000000
12-
2,2050,R1,gassupply1,2030,7.50000000000
13-
2,2064,R1,gassupply1,2030,7.50000000000
14-
2,2065,R1,gassupply1,2030,7.50000000000
15-
2,2069,R1,gassupply1,2030,7.50000000000
3+
1,2035,R1,gassupply1,2030,5.28440000000
4+
1,2040,R1,gassupply1,2030,5.28440000000
5+
1,2045,R1,gassupply1,2030,5.28440000000
6+
1,2050,R1,gassupply1,2030,5.28440000000
7+
1,2069,R1,gassupply1,2030,5.28440000000

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
asset,year,region,technology,installed,capacity
2-
1,2035,R1,gassupply1,2025,2.79440000000
3-
1,2040,R1,gassupply1,2025,2.79440000000
4-
1,2045,R1,gassupply1,2025,2.79440000000
5-
1,2050,R1,gassupply1,2025,2.79440000000
6-
1,2064,R1,gassupply1,2025,2.79440000000
7-
2,2035,R1,gassupply1,2030,7.50000000000
8-
2,2040,R1,gassupply1,2030,7.50000000000
9-
2,2045,R1,gassupply1,2030,7.50000000000
10-
2,2050,R1,gassupply1,2030,7.50000000000
11-
2,2064,R1,gassupply1,2030,7.50000000000
12-
2,2065,R1,gassupply1,2030,7.50000000000
13-
2,2069,R1,gassupply1,2030,7.50000000000
2+
1,2035,R1,gassupply1,2030,5.28440000000
3+
1,2040,R1,gassupply1,2030,5.28440000000
4+
1,2045,R1,gassupply1,2030,5.28440000000
5+
1,2050,R1,gassupply1,2030,5.28440000000
6+
1,2069,R1,gassupply1,2030,5.28440000000

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
asset,year,region,technology,installed,capacity
2-
1,2040,R1,gassupply1,2025,2.79440000000
3-
1,2045,R1,gassupply1,2025,2.79440000000
4-
1,2050,R1,gassupply1,2025,2.79440000000
5-
1,2064,R1,gassupply1,2025,2.79440000000
6-
2,2040,R1,gassupply1,2030,7.50000000000
7-
2,2045,R1,gassupply1,2030,7.50000000000
8-
2,2050,R1,gassupply1,2030,7.50000000000
9-
2,2064,R1,gassupply1,2030,7.50000000000
10-
2,2065,R1,gassupply1,2030,7.50000000000
11-
2,2069,R1,gassupply1,2030,7.50000000000
2+
1,2040,R1,gassupply1,2030,5.28440000000
3+
1,2045,R1,gassupply1,2030,5.28440000000
4+
1,2050,R1,gassupply1,2030,5.28440000000
5+
1,2069,R1,gassupply1,2030,5.28440000000

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
2-
1,2045,R1,gassupply1,2025,2.79440000000
3-
1,2050,R1,gassupply1,2025,2.79440000000
4-
1,2064,R1,gassupply1,2025,2.79440000000
5-
2,2045,R1,gassupply1,2030,7.50000000000
6-
2,2050,R1,gassupply1,2030,7.50000000000
7-
2,2064,R1,gassupply1,2030,7.50000000000
8-
2,2065,R1,gassupply1,2030,7.50000000000
9-
2,2069,R1,gassupply1,2030,7.50000000000
2+
1,2045,R1,gassupply1,2030,5.28440000000
3+
1,2050,R1,gassupply1,2030,5.28440000000
4+
1,2069,R1,gassupply1,2030,5.28440000000

‎docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
asset,year,region,technology,installed,capacity
2-
1,2050,R1,gassupply1,2025,2.79440000000
3-
1,2055,R1,gassupply1,2025,2.79440000000
4-
1,2064,R1,gassupply1,2025,2.79440000000
5-
2,2050,R1,gassupply1,2030,7.50000000000
6-
2,2055,R1,gassupply1,2030,7.50000000000
7-
2,2064,R1,gassupply1,2030,7.50000000000
8-
2,2065,R1,gassupply1,2030,7.50000000000
9-
2,2069,R1,gassupply1,2030,7.50000000000
2+
1,2050,R1,gassupply1,2030,5.28440000000
3+
1,2055,R1,gassupply1,2030,5.28440000000
4+
1,2069,R1,gassupply1,2030,5.28440000000

0 commit comments

Comments
 (0)