codeperl
diff --git a/‎Notes/02_Working_with_data/01_Datatypes.md‎
Lines changed: 5 additions & 7 deletions b/‎Notes/02_Working_with_data/01_Datatypes.md‎
Lines changed: 5 additions & 7 deletions
diff --git a/‎Notes/02_Working_with_data/02_Containers.md‎
Lines changed: 53 additions & 32 deletions b/‎Notes/02_Working_with_data/02_Containers.md‎
Lines changed: 53 additions & 32 deletions
diff --git a/‎Notes/02_Working_with_data/03_Formatting.md‎
Lines changed: 19 additions & 13 deletions b/‎Notes/02_Working_with_data/03_Formatting.md‎
Lines changed: 19 additions & 13 deletions
@@ -1,7 +1,5 @@
 # 2.1 Datatypes and Data structures
 
-This section introduces data structures in the form of tuples and dicts.
-
 ### Primitive Datatypes
 
 Python has a few primitive types of data:
@@ -10,7 +8,7 @@ Python has a few primitive types of data:
 * Floating point numbers
 * Strings (text)
 
-We have learned about these in the previous section.
+We learned about these in the introduction.
 
 ### None type
 
@@ -212,7 +210,7 @@ TypeError: can't multiply sequence by non-int of type 'str'
 To do more, you typically want to interpret the raw data in some way and turn it into a more useful kind of object so that you can work with it later.
 Two simple options are tuples or dictionaries.
 
-### (a) Tuples
+### Exercise 2.1: Tuples
 
 At the interactive prompt, create the following tuple that represents
 the above row, but with the numeric columns converted to proper
@@ -298,7 +296,7 @@ Take the above variables and pack them back into a tuple
 >>>
 ```
 
-### (b) Dictionaries as a data structure
+### Exercise 2.2: Dictionaries as a data structure
 
 An alternative to a tuple is to create a dictionary instead.
 
@@ -341,7 +339,7 @@ Unlike tuples, dictionaries can be freely modified. Add some attributes:
 >>>
 ```
 
-### (c) Some additional dictionary operations
+### Exercise 2.3: Some additional dictionary operations
 
 If you turn a dictionary into a list, you’ll get all of its keys:
 
@@ -428,4 +426,4 @@ dict_items([('name', 'AA'), ('shares', 75), ('price', 32.2), ('date', (6, 11, 20
 >>>
 ```
 
-[Next](02_Containers)
+[Contents](../Contents) \| [Previous (1.6 Files)](../01_Introduction/06_Files) \| [Next (2.2 Containers)](02_Containers)
@@ -194,12 +194,12 @@ s1 - s2                 # Set difference
 
 ## Exercises
 
-### Objectives
+### Exercise 2.4: A list of tuples
 
-### Exercise A: A list of tuples
-
-The file `Data/portfolio.csv` contains a list of stocks in a portfolio.
-In [Section 1.7](), you wrote a function `portfolio_cost(filename)` that read this file and performed a simple calculation.
+The file `Data/portfolio.csv` contains a list of stocks in a
+portfolio.  In [Exercise 1.30](../01_Introduction/07_Functions), you
+wrote a function `portfolio_cost(filename)` that read this file and
+performed a simple calculation.
 
 Your code should have looked something like this:
 
@@ -245,7 +245,9 @@ for row in rows:
 
 Finally, you’ll return the resulting `portfolio` list.
 
-Experiment with your function interactively (just a reminder that in order to do this, you first have to run the `report.py` program in the interpreter):
+Experiment with your function interactively (just a reminder that in
+order to do this, you first have to run the `report.py` program in the
+interpreter):
 
 *Hint: Use `-i` when executing the file in the terminal*
 
@@ -270,8 +272,10 @@ Experiment with your function interactively (just a reminder that in order to do
 >>>
 ```
 
-This list of tuples that you have created is very similar to a 2-D array.
-For example, you can access a specific column and row using a lookup such as `portfolio[row][column]` where `row` and `column` are integers.
+This list of tuples that you have created is very similar to a 2-D
+array.  For example, you can access a specific column and row using a
+lookup such as `portfolio[row][column]` where `row` and `column` are
+integers.
 
 That said, you can also rewrite the last for-loop using a statement like this:
 
@@ -285,12 +289,14 @@ That said, you can also rewrite the last for-loop using a statement like this:
 >>>
 ```
 
-### (b) List of Dictionaries
+### Exercise 2.5: List of Dictionaries
 
-Take the function you wrote in part (a) and modify to represent each stock in the portfolio with a dictionary instead of a tuple.
-In this dictionary use the field names of "name", "shares", and "price" to represent the different columns in the input file.
+Take the function you wrote in part (a) and modify to represent each
+stock in the portfolio with a dictionary instead of a tuple.  In this
+dictionary use the field names of "name", "shares", and "price" to
+represent the different columns in the input file.
 
-Experiment with this new function in the same manner as you did in part (a).
+Experiment with this new function in the same manner as you did in Exercise 2.4.
 
 ```pycon
 >>> portfolio = read_portfolio('portfolio.csv')
@@ -314,10 +320,12 @@ Experiment with this new function in the same manner as you did in part (a).
 >>>
 ```
 
-Here, you will notice that the different fields for each entry are accessed by key names instead of numeric column numbers.
-This is often preferred because the resulting code is easier to read later.
+Here, you will notice that the different fields for each entry are
+accessed by key names instead of numeric column numbers.  This is
+often preferred because the resulting code is easier to read later.
 
-Viewing large dictionaries and lists can be messy. To clean up the output for debugging, considering using the `pprint` function.
+Viewing large dictionaries and lists can be messy. To clean up the
+output for debugging, considering using the `pprint` function.
 
 ```pycon
 >>> from pprint import pprint
@@ -332,10 +340,11 @@ Viewing large dictionaries and lists can be messy. To clean up the output for de
 >>>
 ```
 
-### (c) Dictionaries as a container
+### Exercise 2.6: Dictionaries as a container
 
-A dictionary is a useful way to keep track of items where you want to look up items using an index other than an integer.
-In the Python shell, try playing with a dictionary:
+A dictionary is a useful way to keep track of items where you want to
+look up items using an index other than an integer.  In the Python
+shell, try playing with a dictionary:
 
 ```pycon
 >>> prices = { }
@@ -364,14 +373,20 @@ The file looks something like this:
 ...
 ```
 
-Write a function `read_prices(filename)` that reads a set of prices such as this into a dictionary where the keys of the dictionary are the stock names and the values in the dictionary are the stock prices.
+Write a function `read_prices(filename)` that reads a set of prices
+such as this into a dictionary where the keys of the dictionary are
+the stock names and the values in the dictionary are the stock prices.
 
-To do this, start with an empty dictionary and start inserting values into it just
-as you did above. However, you are reading the values from a file now.
+To do this, start with an empty dictionary and start inserting values
+into it just as you did above. However, you are reading the values
+from a file now.
 
-We’ll use this data structure to quickly lookup the price of a given stock name.
+We’ll use this data structure to quickly lookup the price of a given
+stock name.
 
-A few little tips that you’ll need for this part. First, make sure you use the `csv` module just as you did before—there’s no need to reinvent the wheel here.
+A few little tips that you’ll need for this part. First, make sure you
+use the `csv` module just as you did before—there’s no need to
+reinvent the wheel here.
 
 ```pycon
 >>> import csv
@@ -388,12 +403,16 @@ A few little tips that you’ll need for this part. First, make sure you use the
 >>>
 ```
 
-The other little complication is that the `Data/prices.csv` file may have some blank lines in it. Notice how the last row of data above is an empty list—meaning no data was present on that line.
+The other little complication is that the `Data/prices.csv` file may
+have some blank lines in it. Notice how the last row of data above is
+an empty list—meaning no data was present on that line.
 
-There’s a possibility that this could cause your program to die with an exception.
-Use the `try` and `except` statements to catch this as appropriate.
+There’s a possibility that this could cause your program to die with
+an exception.  Use the `try` and `except` statements to catch this as
+appropriate.
 
-Once you have written your `read_prices()` function, test it interactively to make sure it works:
+Once you have written your `read_prices()` function, test it
+interactively to make sure it works:
 
 ```python
 >>> prices = read_prices('Data/prices.csv')
@@ -404,10 +423,12 @@ Once you have written your `read_prices()` function, test it interactively to ma
 >>>
 ```
 
-### (e) Finding out if you can retire
+### Exercise 2.7: Finding out if you can retire
+
+Tie all of this work together by adding the statements to your
+`report.py` program.  It takes the list of stocks in Exercise 2.5 and
+the dictionary of prices in Exercise 2.6 and computes the current
+value of the portfolio along with the gain/loss.
 
-Tie all of this work together by adding the statements to your `report.py` program.
-It takes the list of stocks in part (b) and the dictionary of prices in part (c) and 
-computes the current value of the portfolio along with the gain/loss.
+[Contents](../Contents) \| [Previous (2.1 Datatypes)](01_Datatypes) \| [Next (2.3 Formatting)](03_Formatting)
 
-[Next](03_Formatting)
 
@@ -101,7 +101,7 @@ b'Dave has 37 messages'
 
 ## Exercises
 
-In the previous exercise, you wrote a program called `report.py` that computed the gain/loss of a
+In Exercise 2.7, you wrote a program called `report.py` that computed the gain/loss of a
 stock portfolio.  In this exercise, you're going to modify it to produce a table like this:
 
 ```code
@@ -116,12 +116,15 @@ stock portfolio.  In this exercise, you're going to modify it to produce a table
            IBM        100     106.28      35.84
 ```
 
-In this report, "Price" is the current share price of the stock and "Change" is the change in the share price from the initial purchase price.
+In this report, "Price" is the current share price of the stock and
+"Change" is the change in the share price from the initial purchase
+price.
 
-### (a) How to format numbers
+### Exercise 2.8: How to format numbers
 
-A common problem with printing numbers is specifying the number of decimal places. One way to fix this is to use f-strings. Try
-these examples:
+A common problem with printing numbers is specifying the number of
+decimal places. One way to fix this is to use f-strings. Try these
+examples:
 
 ```python
 >>> value = 42863.1
@@ -150,7 +153,8 @@ is also sometimes performed using the `%` operator of strings.
 >>>
 ```
 
-Documentation on various codes used with `%` can be found [here](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting).
+Documentation on various codes used with `%` can be found
+[here](https://docs.python.org/3/library/stdtypes.html#printf-style-string-formatting).
 
 Although it’s commonly used with `print`, string formatting is not tied to printing.
 If you want to save a formatted string. Just assign it to a variable.
@@ -162,14 +166,15 @@ If you want to save a formatted string. Just assign it to a variable.
 >>>
 ```
 
-### (b) Collecting Data
+### Exercise 2.9: Collecting Data
 
 In order to generate the above report, you’ll first want to collect
 all of the data shown in the table.  Write a function `make_report()`
 that takes a list of stocks and dictionary of prices as input and
 returns a list of tuples containing the rows of the above table.
 
-Add this function to your `report.py` file. Here’s how it should work if you try it interactively:
+Add this function to your `report.py` file. Here’s how it should work
+if you try it interactively:
 
 ```pycon
 >>> portfolio = read_portfolio('Data/portfolio.csv')
@@ -187,9 +192,10 @@ Add this function to your `report.py` file. Here’s how it should work if you t
 >>>
 ```
 
-### (c) Printing a formatted table
+### Exercise 2.10: Printing a formatted table
 
-Redo the above for-loop, but change the print statement to format the tuples.
+Redo the for-loop in Exercise 2.9, but change the print statement to
+format the tuples.
 
 ```pycon
 >>> for r in report:
@@ -220,7 +226,7 @@ You can also expand the values and use f-strings. For example:
 Take the above statements and add them to your `report.py` program.
 Have your program take the output of the `make_report()` function and print a nicely formatted table as shown.
 
-### (d) Adding some headers
+### Exercise 2.11: Adding some headers
 
 Suppose you had a tuple of header names like this:
 
@@ -257,7 +263,7 @@ When you’re done, your program should produce the table shown at the top of th
            IBM        100     106.28      35.84
 ```
 
-### (e) Formatting Challenge
+### Exercise 2.12: Formatting Challenge
 
 How would you modify your code so that the price includes the currency symbol ($) and the output looks like this:
 
@@ -273,4 +279,4 @@ How would you modify your code so that the price includes the currency symbol ($
            IBM        100    $106.28      35.84
 ```
 
-[Next](04_Sequences)
+[Contents](../Contents) \| [Previous (2.2 Containers)](02_Containers) \| [Next (2.4 Sequences)](04_Sequences)