QuantEcon
diff --git a/Collapse file
‎lectures/functions.md‎
Copy file name to clipboardExpand all lines: lectures/functions.md
+17-74Lines changed: 17 additions & 74 deletions
Display the source diff
Display the rich diff b/Collapse file
‎lectures/functions.md‎
Copy file name to clipboardExpand all lines: lectures/functions.md
+17-74Lines changed: 17 additions & 74 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎lectures/python_essentials.md‎
Copy file name to clipboardExpand all lines: lectures/python_essentials.md
+64-2Lines changed: 64 additions & 2 deletions
Display the source diff
Display the rich diff b/Collapse file
‎lectures/python_essentials.md‎
Copy file name to clipboardExpand all lines: lectures/python_essentials.md
+64-2Lines changed: 64 additions & 2 deletions
Display the source diff
Display the rich diff
@@ -118,7 +118,7 @@ This will become clearer as you see more examples.
 
 Let's start by discussing how it's done.
 
-### Syntax
+### Basic Syntax
 
 Here's a very simple Python function, that implements the mathematical function
 $f(x) = 2 x + 1$
@@ -171,6 +171,20 @@ print(new_abs_function(3))
 print(new_abs_function(-3))
 ```
 
+Note that a function can have arbitrarily many `return` statements (including zero).
+
+Execution of the function terminates when the first return is hit, allowing
+code like the following example
+
+```{code-cell} python3
+def f(x):
+    if x < 0:
+        return 'negative'
+    return 'nonnegative'
+```
+
+Functions without a return statement automatically return the special Python object `None`.
+
 ### Keyword Arguments
 
 ```{index} single: Python; keyword arguments
@@ -227,79 +241,8 @@ In particular
 * Any object can be passed to a function as an argument, including other functions.
 * A function can return any kind of object, including functions.
 
-We already {ref}`gave an example <test_program_6>` of how straightforward it is to pass a function to
-a function.
-
-Note that a function can have arbitrarily many `return` statements (including zero).
-
-Execution of the function terminates when the first return is hit, allowing
-code like the following example
-
-```{code-cell} python3
-def f(x):
-    if x < 0:
-        return 'negative'
-    return 'nonnegative'
-```
-
-Functions without a return statement automatically return the special Python object `None`.
-
-
-### Docstrings
-
-```{index} single: Python; Docstrings
-```
-
-Python has a system for adding comments to functions, modules, etc. called *docstrings*.
-
-The nice thing about docstrings is that they are available at run-time.
-
-Try running this
-
-```{code-cell} python3
-def f(x):
-    """
-    This function squares its argument
-    """
-    return x**2
-```
-
-After running this code, the docstring is available
-
-```{code-cell} ipython
-f?
-```
-
-```{code-block} ipython
-:class: no-execute
-
-Type:       function
-String Form:<function f at 0x2223320>
-File:       /home/john/temp/temp.py
-Definition: f(x)
-Docstring:  This function squares its argument
-```
-
-```{code-cell} ipython
-f??
-```
-
-```{code-block} ipython
-:class: no-execute
-
-Type:       function
-String Form:<function f at 0x2223320>
-File:       /home/john/temp/temp.py
-Definition: f(x)
-Source:
-def f(x):
-    """
-    This function squares its argument
-    """
-    return x**2
-```
-
-With one question mark we bring up the docstring, and with two we get the source code as well.
+We will give examples of how straightforward it is to pass a function to
+a function in the following sections.
 
 ### One-Line Functions: `lambda`
 
 
@@ -600,12 +600,18 @@ Note:
 * `all()` returns `True` when *all* boolean values/expressions in the sequence are `True`
 * `any()` returns `True` when *any* boolean values/expressions in the sequence are `True`
 
-## Coding Style and PEP8
+
+## Coding Style and Documentation
+
+A consistent coding style and the use of 
+documentations can make the code easier to understand and maintain.
+
+### Python Style Guidelines: PEP8
 
 ```{index} single: Python; PEP8
 ```
 
-To learn more about the Python programming philosophy type `import this` at the prompt.
+You can find Python programming philosophy by typing `import this` at the prompt.
 
 Among other things, Python strongly favors consistency in programming style.
 
@@ -621,6 +627,62 @@ In Python, the standard style is set out in [PEP8](https://www.python.org/dev/pe
 
 (Occasionally we'll deviate from PEP8 in these lectures to better match mathematical notation)
 
+### Docstrings
+
+```{index} single: Python; Docstrings
+```
+
+Python has a system for adding comments to modules, class, functions, etc. called *docstrings*.
+
+The nice thing about docstrings is that they are available at run-time.
+
+Try running this
+
+```{code-cell} python3
+def f(x):
+    """
+    This function squares its argument
+    """
+    return x**2
+```
+
+After running this code, the docstring is available
+
+```{code-cell} ipython
+f?
+```
+
+```{code-block} ipython
+:class: no-execute
+
+Type:       function
+String Form:<function f at 0x2223320>
+File:       /home/john/temp/temp.py
+Definition: f(x)
+Docstring:  This function squares its argument
+```
+
+```{code-cell} ipython
+f??
+```
+
+```{code-block} ipython
+:class: no-execute
+
+Type:       function
+String Form:<function f at 0x2223320>
+File:       /home/john/temp/temp.py
+Definition: f(x)
+Source:
+def f(x):
+    """
+    This function squares its argument
+    """
+    return x**2
+```
+
+With one question mark we bring up the docstring, and with two we get the source code as well.
+
 ## Exercises
 
 Solve the following exercises.