Commit 4992e412 authored by sp2668's avatar sp2668

Change nomenclature q/Q -> d/D for demand + g/G for generation

parent 4a0e0cb9
......@@ -27,7 +27,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 33,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -92,7 +92,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 34,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -105,7 +105,7 @@
"array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])"
]
},
"execution_count": 2,
"execution_count": 34,
"metadata": {},
"output_type": "execute_result"
}
......@@ -117,7 +117,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 35,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -130,7 +130,7 @@
"array([1, 2])"
]
},
"execution_count": 3,
"execution_count": 35,
"metadata": {},
"output_type": "execute_result"
}
......@@ -152,7 +152,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 36,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -162,13 +162,13 @@
{
"data": {
"text/plain": [
"foo 0.191527\n",
"bar 0.866264\n",
"baz 0.338317\n",
"foo 0.268016\n",
"bar 0.969528\n",
"baz 0.171212\n",
"dtype: float64"
]
},
"execution_count": 4,
"execution_count": 36,
"metadata": {},
"output_type": "execute_result"
}
......@@ -180,7 +180,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 37,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -190,12 +190,12 @@
{
"data": {
"text/plain": [
"foo 0.191527\n",
"bar 0.866264\n",
"foo 0.268016\n",
"bar 0.969528\n",
"dtype: float64"
]
},
"execution_count": 5,
"execution_count": 37,
"metadata": {},
"output_type": "execute_result"
}
......@@ -228,7 +228,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 38,
"metadata": {
"scrolled": false,
"slideshow": {
......@@ -239,12 +239,12 @@
{
"data": {
"text/plain": [
"array([[ 0.23005626, 0.85227057, 0.83846306, 0.89066314, 0.71151271],\n",
" [ 0.07761223, 0.97980108, 0.34868122, 0.75078926, 0.96252371],\n",
" [ 0.92787399, 0.62272409, 0.58763381, 0.71937543, 0.19855054]])"
"array([[ 0.63346698, 0.22021609, 0.42064879, 0.47521256, 0.82246114],\n",
" [ 0.91677278, 0.33011203, 0.38242317, 0.73180186, 0.19080544],\n",
" [ 0.14882987, 0.74586303, 0.97671972, 0.21033794, 0.3308271 ]])"
]
},
"execution_count": 6,
"execution_count": 38,
"metadata": {},
"output_type": "execute_result"
}
......@@ -266,7 +266,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 39,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -304,27 +304,27 @@
" <tbody>\n",
" <tr>\n",
" <th>foo</th>\n",
" <td>0.903758</td>\n",
" <td>0.597699</td>\n",
" <td>0.105770</td>\n",
" <td>0.708391</td>\n",
" <td>0.833426</td>\n",
" <td>0.970723</td>\n",
" <td>0.416728</td>\n",
" <td>0.120606</td>\n",
" <td>0.296505</td>\n",
" <td>0.898589</td>\n",
" </tr>\n",
" <tr>\n",
" <th>bar</th>\n",
" <td>0.218514</td>\n",
" <td>0.784634</td>\n",
" <td>0.626200</td>\n",
" <td>0.797509</td>\n",
" <td>0.501407</td>\n",
" <td>0.323891</td>\n",
" <td>0.369041</td>\n",
" <td>0.533998</td>\n",
" <td>0.705619</td>\n",
" <td>0.670083</td>\n",
" </tr>\n",
" <tr>\n",
" <th>baz</th>\n",
" <td>0.907245</td>\n",
" <td>0.841323</td>\n",
" <td>0.027155</td>\n",
" <td>0.133918</td>\n",
" <td>0.689129</td>\n",
" <td>0.665230</td>\n",
" <td>0.203579</td>\n",
" <td>0.451946</td>\n",
" <td>0.994433</td>\n",
" <td>0.131078</td>\n",
" </tr>\n",
" </tbody>\n",
"</table>\n",
......@@ -332,12 +332,12 @@
],
"text/plain": [
" 0 1 2 3 4\n",
"foo 0.903758 0.597699 0.105770 0.708391 0.833426\n",
"bar 0.218514 0.784634 0.626200 0.797509 0.501407\n",
"baz 0.907245 0.841323 0.027155 0.133918 0.689129"
"foo 0.970723 0.416728 0.120606 0.296505 0.898589\n",
"bar 0.323891 0.369041 0.533998 0.705619 0.670083\n",
"baz 0.665230 0.203579 0.451946 0.994433 0.131078"
]
},
"execution_count": 7,
"execution_count": 39,
"metadata": {},
"output_type": "execute_result"
}
......@@ -349,7 +349,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 40,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -359,15 +359,15 @@
{
"data": {
"text/plain": [
"0 0.676506\n",
"1 0.741219\n",
"2 0.253041\n",
"3 0.546606\n",
"4 0.674654\n",
"0 0.653281\n",
"1 0.329783\n",
"2 0.368850\n",
"3 0.665519\n",
"4 0.566583\n",
"dtype: float64"
]
},
"execution_count": 8,
"execution_count": 40,
"metadata": {},
"output_type": "execute_result"
}
......@@ -412,7 +412,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 41,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -427,7 +427,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 42,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -453,7 +453,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 43,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -537,7 +537,7 @@
"2011-01-01 04:00:00 0.627257 0.0 39923.0"
]
},
"execution_count": 11,
"execution_count": 43,
"metadata": {},
"output_type": "execute_result"
}
......@@ -559,7 +559,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 44,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -572,7 +572,7 @@
"True"
]
},
"execution_count": 12,
"execution_count": 44,
"metadata": {},
"output_type": "execute_result"
}
......@@ -597,7 +597,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 45,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -621,7 +621,7 @@
" dtype='datetime64[ns]', name='time', length=35064, freq=None)"
]
},
"execution_count": 13,
"execution_count": 45,
"metadata": {},
"output_type": "execute_result"
}
......@@ -643,7 +643,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 46,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -741,7 +741,7 @@
"max 0.994588 0.913781 79286.000000"
]
},
"execution_count": 14,
"execution_count": 46,
"metadata": {},
"output_type": "execute_result"
}
......@@ -752,7 +752,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 47,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -769,7 +769,7 @@
"dtype: float64"
]
},
"execution_count": 15,
"execution_count": 47,
"metadata": {},
"output_type": "execute_result"
}
......@@ -809,7 +809,7 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 48,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -840,7 +840,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 49,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -882,7 +882,7 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": 50,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -925,7 +925,7 @@
},
{
"cell_type": "code",
"execution_count": 19,
"execution_count": 51,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -935,10 +935,10 @@
{
"data": {
"text/plain": [
"<matplotlib.legend.Legend at 0x7f4e6e919cc0>"
"<matplotlib.legend.Legend at 0x7fcfdf767940>"
]
},
"execution_count": 19,
"execution_count": 51,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1013,7 +1013,7 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": 52,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -1024,10 +1024,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f4e6e919b00>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7fd01eb7acc0>"
]
},
"execution_count": 20,
"execution_count": 52,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1064,7 +1064,7 @@
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": 53,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -1075,10 +1075,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f4e66ebfeb8>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7fcfdf658f98>"
]
},
"execution_count": 21,
"execution_count": 53,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1114,7 +1114,7 @@
},
{
"cell_type": "code",
"execution_count": 22,
"execution_count": 54,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1127,7 +1127,7 @@
"(0.0, 2)"
]
},
"execution_count": 22,
"execution_count": 54,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1166,7 +1166,7 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": 55,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -1177,10 +1177,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f4e6ed95518>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7fd01eeec550>"
]
},
"execution_count": 23,
"execution_count": 55,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1221,7 +1221,7 @@
},
{
"cell_type": "code",
"execution_count": 24,
"execution_count": 56,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1246,7 +1246,7 @@
},
{
"cell_type": "code",
"execution_count": 25,
"execution_count": 57,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -1259,7 +1259,7 @@
"Text(0.5,0,'1 / a')"
]
},
"execution_count": 25,
"execution_count": 57,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1354,7 +1354,7 @@
},
{
"cell_type": "code",
"execution_count": 26,
"execution_count": 58,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1381,7 +1381,7 @@
},
{
"cell_type": "code",
"execution_count": 27,
"execution_count": 59,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1406,7 +1406,7 @@
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": 60,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1465,7 +1465,7 @@
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": 61,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1500,7 +1500,7 @@
},
{
"cell_type": "code",
"execution_count": 30,
"execution_count": 62,
"metadata": {
"scrolled": true,
"slideshow": {
......@@ -1511,10 +1511,10 @@
{
"data": {
"text/plain": [
"<matplotlib.axes._subplots.AxesSubplot at 0x7f4e433cde48>"
"<matplotlib.axes._subplots.AxesSubplot at 0x7fcfdf2e3cc0>"
]
},
"execution_count": 30,
"execution_count": 62,
"metadata": {},
"output_type": "execute_result"
},
......@@ -1550,7 +1550,7 @@
},
{
"cell_type": "code",
"execution_count": 31,
"execution_count": 63,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -1563,7 +1563,7 @@
"Text(0.5,0,'1 / a')"
]
},
"execution_count": 31,
"execution_count": 63,
"metadata": {},
"output_type": "execute_result"
},
......
......@@ -24,7 +24,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 3,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -52,7 +52,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 4,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -80,7 +80,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 5,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -94,7 +94,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 6,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -108,7 +108,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 7,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -122,7 +122,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 8,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -136,7 +136,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 9,
"metadata": {
"slideshow": {
"slide_type": "subslide"
......@@ -150,7 +150,7 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 10,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -164,7 +164,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": 11,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -178,7 +178,7 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": 12,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -203,7 +203,7 @@
},
{
"cell_type": "code",
"execution_count": 11,
"execution_count": 13,
"metadata": {
"slideshow": {
"slide_type": "skip"
......@@ -227,7 +227,7 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 14,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -266,7 +266,7 @@
},
{
"cell_type": "code",
"execution_count": 13,
"execution_count": 15,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -318,7 +318,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": 16,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -341,7 +341,7 @@
"0.73913043212890694"
]
},
"execution_count": 14,
"execution_count": 16,
"metadata": {},
"output_type": "execute_result"
}
......@@ -365,7 +365,7 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 17,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -378,7 +378,7 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 18,
"metadata": {
"slideshow": {
"slide_type": "fragment"
......@@ -401,7 +401,7 @@
"0.56521739196777387"
]
},
"execution_count": 16,
"execution_count": 18,
"metadata": {},
"output_type": "execute_result"
}
......@@ -413,7 +413,7 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 19,
"metadata": {
"slideshow": {