Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
esm-course
esm-tutorials
Commits
1e3ce703
Commit
1e3ce703
authored
Jun 27, 2019
by
Fabian Neumann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor clarifications and updates in T5
parent
c50c7922
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
229 additions
and
246 deletions
+229
-246
tutorial-3/notebooks/tutorial-3-task-2-solution.ipynb
tutorial-3/notebooks/tutorial-3-task-2-solution.ipynb
+44
-44
tutorial-5/notebooks/tutorial-5-task-2-solution.ipynb
tutorial-5/notebooks/tutorial-5-task-2-solution.ipynb
+28
-28
tutorial-5/notebooks/tutorial-5-task-3-solution.ipynb
tutorial-5/notebooks/tutorial-5-task-3-solution.ipynb
+120
-125
tutorial-5/notebooks/tutorial-5-task-3.ipynb
tutorial-5/notebooks/tutorial-5-task-3.ipynb
+33
-44
tutorial-5/worksheet/sheet05.pdf
tutorial-5/worksheet/sheet05.pdf
+0
-0
tutorial-5/worksheet/sheet05.tex
tutorial-5/worksheet/sheet05.tex
+1
-1
tutorial-5/worksheet/solution05.pdf
tutorial-5/worksheet/solution05.pdf
+0
-0
tutorial-5/worksheet/solution05.tex
tutorial-5/worksheet/solution05.tex
+3
-4
No files found.
tutorial-3/notebooks/tutorial-3-task-2-solution.ipynb
View file @
1e3ce703
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78c4d2b9b
0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee975a63
0>"
]
]
},
},
"execution_count": 10,
"execution_count": 10,
...
@@ -440,7 +440,7 @@
...
@@ -440,7 +440,7 @@
" Number of bounded subproblems: 0\n",
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Error rc: 0\n",
" Time: 3.
998594045639038
\n",
" Time: 3.
898280382156372
\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
...
@@ -638,7 +638,7 @@
...
@@ -638,7 +638,7 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78c04b8b3
8>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee4f55c1
8>"
]
]
},
},
"execution_count": 19,
"execution_count": 19,
...
@@ -774,7 +774,7 @@
...
@@ -774,7 +774,7 @@
" Number of bounded subproblems: 0\n",
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Error rc: 0\n",
" Time:
8.340548753738
40
3
\n",
" Time:
7.731746435165
40
5
\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
...
@@ -939,7 +939,7 @@
...
@@ -939,7 +939,7 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78c16755c0
>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee6148748
>"
]
]
},
},
"execution_count": 26,
"execution_count": 26,
...
@@ -1002,7 +1002,7 @@
...
@@ -1002,7 +1002,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 2
9
,
"execution_count": 2
8
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1079,7 +1079,7 @@
...
@@ -1079,7 +1079,7 @@
"2012-01-01 04:00:00 0.0 0.641201"
"2012-01-01 04:00:00 0.0 0.641201"
]
]
},
},
"execution_count": 2
9
,
"execution_count": 2
8
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1091,7 +1091,7 @@
...
@@ -1091,7 +1091,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
30
,
"execution_count":
29
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1101,10 +1101,10 @@
...
@@ -1101,10 +1101,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78c1675860
>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee623d2e8
>"
]
]
},
},
"execution_count":
30
,
"execution_count":
29
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -1127,7 +1127,7 @@
...
@@ -1127,7 +1127,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
1
,
"execution_count": 3
0
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "skip"
"slide_type": "skip"
...
@@ -1151,7 +1151,7 @@
...
@@ -1151,7 +1151,7 @@
" dtype='datetime64[ns]', name='name', length=744, freq=None)"
" dtype='datetime64[ns]', name='name', length=744, freq=None)"
]
]
},
},
"execution_count": 3
1
,
"execution_count": 3
0
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1162,7 +1162,7 @@
...
@@ -1162,7 +1162,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
2
,
"execution_count": 3
1
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1175,7 +1175,7 @@
...
@@ -1175,7 +1175,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
3
,
"execution_count": 3
2
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1193,7 +1193,7 @@
...
@@ -1193,7 +1193,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
4
,
"execution_count": 3
3
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1222,7 +1222,7 @@
...
@@ -1222,7 +1222,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
5
,
"execution_count": 3
4
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1279,7 +1279,7 @@
...
@@ -1279,7 +1279,7 @@
" Number of bounded subproblems: 0\n",
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Error rc: 0\n",
" Time: 8.
114485740661621
\n",
" Time: 8.
02032470703125
\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
...
@@ -1294,7 +1294,7 @@
...
@@ -1294,7 +1294,7 @@
"('ok', 'optimal')"
"('ok', 'optimal')"
]
]
},
},
"execution_count": 3
5
,
"execution_count": 3
4
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1316,7 +1316,7 @@
...
@@ -1316,7 +1316,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
6
,
"execution_count": 3
5
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1329,7 +1329,7 @@
...
@@ -1329,7 +1329,7 @@
"525.895790860553"
"525.895790860553"
]
]
},
},
"execution_count": 3
6
,
"execution_count": 3
5
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1341,7 +1341,7 @@
...
@@ -1341,7 +1341,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
7
,
"execution_count": 3
6
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1356,7 +1356,7 @@
...
@@ -1356,7 +1356,7 @@
"Name: p_nom_opt, dtype: float64"
"Name: p_nom_opt, dtype: float64"
]
]
},
},
"execution_count": 3
7
,
"execution_count": 3
6
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1369,7 +1369,7 @@
...
@@ -1369,7 +1369,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
8
,
"execution_count": 3
7
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1391,7 +1391,7 @@
...
@@ -1391,7 +1391,7 @@
"Name: p_nom_opt, dtype: float64"
"Name: p_nom_opt, dtype: float64"
]
]
},
},
"execution_count": 3
8
,
"execution_count": 3
7
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1404,7 +1404,7 @@
...
@@ -1404,7 +1404,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 3
9
,
"execution_count": 3
8
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1421,7 +1421,7 @@
...
@@ -1421,7 +1421,7 @@
"Name: e_nom_opt, dtype: float64"
"Name: e_nom_opt, dtype: float64"
]
]
},
},
"execution_count": 3
9
,
"execution_count": 3
8
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
}
}
...
@@ -1434,7 +1434,7 @@
...
@@ -1434,7 +1434,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
40
,
"execution_count":
39
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1444,10 +1444,10 @@
...
@@ -1444,10 +1444,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78bfd405f
8>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee4855e4
8>"
]
]
},
},
"execution_count":
40
,
"execution_count":
39
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -1470,7 +1470,7 @@
...
@@ -1470,7 +1470,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
1
,
"execution_count": 4
0
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1480,10 +1480,10 @@
...
@@ -1480,10 +1480,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78bfdfab0
0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee49060f
0>"
]
]
},
},
"execution_count": 4
1
,
"execution_count": 4
0
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -1520,7 +1520,7 @@
...
@@ -1520,7 +1520,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
2
,
"execution_count": 4
1
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1539,7 +1539,7 @@
...
@@ -1539,7 +1539,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
3
,
"execution_count": 4
2
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -1562,7 +1562,7 @@
...
@@ -1562,7 +1562,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
4
,
"execution_count": 4
3
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1591,7 +1591,7 @@
...
@@ -1591,7 +1591,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
5
,
"execution_count": 4
4
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1601,10 +1601,10 @@
...
@@ -1601,10 +1601,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78bff63358
>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee4a5e240
>"
]
]
},
},
"execution_count": 4
5
,
"execution_count": 4
4
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -1628,7 +1628,7 @@
...
@@ -1628,7 +1628,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
6
,
"execution_count": 4
5
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1638,10 +1638,10 @@
...
@@ -1638,10 +1638,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78bffd6860
>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee4af0198
>"
]
]
},
},
"execution_count": 4
6
,
"execution_count": 4
5
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -1665,7 +1665,7 @@
...
@@ -1665,7 +1665,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count": 4
7
,
"execution_count": 4
6
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "subslide"
"slide_type": "subslide"
...
@@ -1675,10 +1675,10 @@
...
@@ -1675,10 +1675,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
78c0dee4e
0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
6ee4b2fa9
0>"
]
]
},
},
"execution_count": 4
7
,
"execution_count": 4
6
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
...
tutorial-5/notebooks/tutorial-5-task-2-solution.ipynb
View file @
1e3ce703
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
4
,
"execution_count":
1
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "skip"
"slide_type": "skip"
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
5
,
"execution_count":
2
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
6
,
"execution_count":
3
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -133,10 +133,10 @@
...
@@ -133,10 +133,10 @@
{
{
"data": {
"data": {
"text/plain": [
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
ba9494516
0>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7f
09f5771fd
0>"
]
]
},
},
"execution_count":
6
,
"execution_count":
3
,
"metadata": {},
"metadata": {},
"output_type": "execute_result"
"output_type": "execute_result"
},
},
...
@@ -197,7 +197,7 @@
...
@@ -197,7 +197,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
7
,
"execution_count":
4
,
"metadata": {
"metadata": {
"slideshow": {
"slideshow": {
"slide_type": "fragment"
"slide_type": "fragment"
...
@@ -240,7 +240,7 @@
...
@@ -240,7 +240,7 @@
},
},
{
{
"cell_type": "code",
"cell_type": "code",
"execution_count":
8
,
"execution_count":
5
,
"metadata": {
"metadata": {
"scrolled": true,
"scrolled": true,
"slideshow": {
"slideshow": {
...
@@ -289,7 +289,7 @@
...
@@ -289,7 +289,7 @@
" Number of bounded subproblems: 0\n",
" Number of bounded subproblems: 0\n",
" Number of created subproblems: 0\n",
" Number of created subproblems: 0\n",
" Error rc: 0\n",
" Error rc: 0\n",
" Time: 0.18
898773193359375
\n",
" Time: 0.18
75760555267334
\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
"# Solution Information\n",
"# Solution Information\n",
"# ----------------------------------------------------------\n",
"# ----------------------------------------------------------\n",
...
@@ -304,7 +304,7 @@
...
@@ -304,7 +304,7 @@
"('ok', 'optimal')"
"('ok', 'optimal')"
]
]
},
},
"execution_count":
8
,