Add video and streamline content

This commit is contained in:
Alexander Hess 2020-03-30 04:25:04 +02:00
parent 4171517c77
commit c1268172d0
4 changed files with 494 additions and 439 deletions

File diff suppressed because one or more lines are too long

View file

@ -18,7 +18,9 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Read [Chapter 2](https://nbviewer.jupyter.org/github/webartifex/intro-to-python/blob/master/02_functions_00_lecture.ipynb) of the book. Then, work through the questions below."
"The questions below assume that you have read [Chapter 2](https://nbviewer.jupyter.org/github/webartifex/intro-to-python/blob/master/02_functions_00_lecture.ipynb) in the book.\n",
"\n",
"Be concise in your answers! Most questions can be answered in *one* sentence."
]
},
{
@ -28,13 +30,6 @@
"### Essay Questions "
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"Answer the following questions *briefly*!"
]
},
{
"cell_type": "markdown",
"metadata": {},
@ -46,7 +41,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -60,7 +55,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -74,7 +69,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -88,7 +83,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -102,7 +97,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -116,7 +111,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -130,7 +125,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -158,7 +153,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -172,7 +167,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -186,7 +181,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -200,7 +195,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
}
],
@ -220,7 +215,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.4"
},
"toc": {
"base_numbering": 1,

View file

@ -18,7 +18,9 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"Read [Chapter 2](https://nbviewer.jupyter.org/github/webartifex/intro-to-python/blob/master/02_functions_00_lecture.ipynb) of the book. Then, work through the exercises below. The `...` indicate where you need to fill in your answers. You should not need to create any additional code cells."
"The exercises below assume that you have read [Chapter 2](https://nbviewer.jupyter.org/github/webartifex/intro-to-python/blob/master/02_functions_00_lecture.ipynb) in the book.\n",
"\n",
"The `...`'s in the code cells indicate where you need to fill in code snippets. The number of `...`'s within a code cell give you a rough idea of how many lines of code are needed to solve the task. You should not need to create any additional code cells for your final solution. However, you may want to use temporary code cells to try out some ideas."
]
},
{
@ -66,7 +68,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"**Q2**: Encapsulate the logic into a function `sphere_volume()` that takes one *positional* argument `radius` and one *keyword-only* argument `digits` defaulting to `5`. The volume should be returned as a `float` object under *all* circumstances. Document your work appropriately in a docstring according to [Google's Python Style Guide](https://github.com/google/styleguide/blob/gh-pages/pyguide.md)."
"**Q2**: Encapsulate the logic into a function `sphere_volume()` that takes one *positional* argument `radius` and one *keyword-only* argument `digits` defaulting to `5`. The volume should be returned as a `float` object under *all* circumstances."
]
},
{
@ -76,7 +78,17 @@
"outputs": [],
"source": [
"def sphere_volume(...):\n",
" ..."
" \"\"\"Calculate the volume of a sphere.\n",
"\n",
" Args:\n",
" radius (float): radius of the sphere\n",
" digits (optional, int): number of digits\n",
" for rounding the resulting volume\n",
"\n",
" Returns:\n",
" volume (float)\n",
" \"\"\"\n",
" return ..."
]
},
{
@ -151,7 +163,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
},
{
@ -193,7 +205,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
" "
" < your answer >"
]
}
],
@ -213,7 +225,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.6"
"version": "3.7.4"
},
"toc": {
"base_numbering": 1,

View file

@ -43,7 +43,7 @@ def average(numbers, *, scalar=1):
scalar (float, optional): multiplies the average; defaults to 1
Returns:
float: (scaled) average
scaled_average (float)
"""
return _scaled_average(_round_all(numbers), scalar)
@ -57,7 +57,7 @@ def average_evens(numbers, *, scalar=1):
scalar (float, optional): multiplies the average; defaults to 1
Returns:
float: (scaled) average
scaled_average (float)
"""
return _scaled_average([n for n in _round_all(numbers) if n % 2 == 0], scalar)
@ -71,6 +71,6 @@ def average_odds(numbers, *, scalar=1):
scalar (float, optional): multiplies the average; defaults to 1
Returns:
float: (scaled) average
scaled_average (float)
"""
return _scaled_average([n for n in _round_all(numbers) if n % 2 != 0], scalar)