Commit 1e3ce703 authored by Fabian Neumann's avatar Fabian Neumann

minor clarifications and updates in T5

parent c50c7922
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
{ {
"data": { "data": {
"text/plain": [ "text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f78c4d2b9b0>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee975a630>"
] ]
}, },
"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 0x7f78c04b8b38>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4f55c18>"
] ]
}, },
"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.340548753738403\n", " Time: 7.731746435165405\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 0x7f78c16755c0>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee6148748>"
] ]
}, },
"execution_count": 26, "execution_count": 26,
...@@ -1002,7 +1002,7 @@ ...@@ -1002,7 +1002,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 29, "execution_count": 28,
"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": 29, "execution_count": 28,
"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 0x7f78c1675860>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee623d2e8>"
] ]
}, },
"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": 31, "execution_count": 30,
"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": 31, "execution_count": 30,
"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": 32, "execution_count": 31,
"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": 33, "execution_count": 32,
"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": 34, "execution_count": 33,
"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": 35, "execution_count": 34,
"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": 35, "execution_count": 34,
"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": 36, "execution_count": 35,
"metadata": { "metadata": {
"slideshow": { "slideshow": {
"slide_type": "fragment" "slide_type": "fragment"
...@@ -1329,7 +1329,7 @@ ...@@ -1329,7 +1329,7 @@
"525.895790860553" "525.895790860553"
] ]
}, },
"execution_count": 36, "execution_count": 35,
"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": 37, "execution_count": 36,
"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": 37, "execution_count": 36,
"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": 38, "execution_count": 37,
"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": 38, "execution_count": 37,
"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": 39, "execution_count": 38,
"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": 39, "execution_count": 38,
"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 0x7f78bfd405f8>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4855e48>"
] ]
}, },
"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": 41, "execution_count": 40,
"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 0x7f78bfdfab00>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee49060f0>"
] ]
}, },
"execution_count": 41, "execution_count": 40,
"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": 42, "execution_count": 41,
"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": 43, "execution_count": 42,
"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": 44, "execution_count": 43,
"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": 45, "execution_count": 44,
"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 0x7f78bff63358>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4a5e240>"
] ]
}, },
"execution_count": 45, "execution_count": 44,
"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": 46, "execution_count": 45,
"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 0x7f78bffd6860>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4af0198>"
] ]
}, },
"execution_count": 46, "execution_count": 45,
"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": 47, "execution_count": 46,
"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 0x7f78c0dee4e0>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f6ee4b2fa90>"
] ]
}, },
"execution_count": 47, "execution_count": 46,
"metadata": {}, "metadata": {},
"output_type": "execute_result" "output_type": "execute_result"
}, },
......
...@@ -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 0x7fba94945160>" "<matplotlib.axes._subplots.AxesSubplot at 0x7f09f5771fd0>"
] ]
}, },
"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.18898773193359375\n", " Time: 0.1875760555267334\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,