Merge pull request #47 from danmichaelo/patch-1

Change 'lab' to 'library' and 'pressures' to 'temperatures'

Author: lwrubel

_episodes/02-variables.md

@@ -270,7 +270,7 @@ print(ewr_422_yY, 'is', flabadab, 'years old')
 > Which is a better variable name, `m`, `min`, or `minutes`?
 > Why?
 > Hint: think about which code you would rather inherit
-> from someone who is leaving the lab:
+> from someone who is leaving the library:
 >
 > 1. `ts = m * 60 + s`
 > 2. `tot_sec = min * 60 + sec`

_episodes/11-lists.md

@@ -21,21 +21,23 @@ keypoints:
 ---
 ## A list stores many values in a single structure.
 
-*   Doing calculations with a hundred variables called `pressure_001`, `pressure_002`, etc.,
+*   Scenario: You have set up an Arduino to do temperature measurements
+    in a storage room for rare books.
+*   Doing calculations with a hundred variables called `temperature_001`, `temperature_002`, etc.,
     would be at least as slow as doing them by hand.
 *   Use a *list* to store many values together.
     *   Contained within square brackets `[...]`.
     *   Values separated by commas `,`.
 *   Use `len` to find out how many values are in a list.
 
 ~~~
-pressures = [0.273, 0.275, 0.277, 0.275, 0.276]
-print('pressures:', pressures)
-print('length:', len(pressures))
+temperatures = [17.3, 17.5, 17.7, 17.5, 17.6]
+print('temperatures:', temperatures)
+print('length:', len(temperatures))
 ~~~
 {: .python}
 ~~~
-pressures: [0.273, 0.275, 0.277, 0.275, 0.276]
+temperatures: [17.3, 17.5, 17.7, 17.5, 17.6]
 length: 5
 ~~~
 {: .output}
@@ -45,13 +47,13 @@ length: 5
 *   Just like strings.
 
 ~~~
-print('zeroth item of pressures:', pressures[0])
-print('fourth item of pressures:', pressures[4])
+print('zeroth item of temperatures:', temperatures[0])
+print('fourth item of temperatures:', temperatures[4])
 ~~~
 {: .python}
 ~~~
-zeroth item of pressures: 0.273
-fourth item of pressures: 0.276
+zeroth item of temperatures: 17.3
+fourth item of temperatures: 17.6
 ~~~
 {: .output}
 
@@ -60,12 +62,12 @@ fourth item of pressures: 0.276
 *   Use an index expression on the left of assignment to replace a value.
 
 ~~~
-pressures[0] = 0.265
-print('pressures is now:', pressures)
+temperatures[0] = 16.5
+print('temperatures is now:', temperatures)
 ~~~
 {: .python}
 ~~~
-pressures is now: [0.265, 0.275, 0.277, 0.275, 0.276]
+temperatures is now: [16.5, 17.5, 17.7, 17.5, 17.6]
 ~~~
 {: .output}
 
@@ -74,16 +76,15 @@ pressures is now: [0.265, 0.275, 0.277, 0.275, 0.276]
 *   Use `list_name.append` to add items to the end of a list.
 
 ~~~
-primes = [2, 3, 5]
-print('primes is initially:', primes)
-primes.append(7)
-primes.append(9)
-print('primes has become:', primes)
+print('temperatures is initially:', temperatures)
+temperatures.append(17.9)
+temperatures.append(18.2)
+print('temperatures has become:', temperatures)
 ~~~
 {: .python}
 ~~~
-primes is initially: [2, 3, 5]
-primes has become: [2, 3, 5, 7, 9]
+temperatures is initially: [16.5, 17.5, 17.7, 17.5, 17.6]
+temperatures has become: [16.5, 17.5, 17.7, 17.5, 17.6, 17.9, 18.2]
 ~~~
 {: .output}
 
@@ -93,25 +94,6 @@ primes has become: [2, 3, 5, 7, 9]
     *   Deliberately resembles the way we refer to things in a library.
 *   We will meet other methods of lists as we go along.
     *   Use `help(list)` for a preview.
-*   `extend` is similar to `append`, but it allows you to combine two lists.  For example:  
-
-~~~
-teen_primes = [11, 13, 17, 19]
-middle_aged_primes = [37, 41, 43, 47]
-print('primes is currently:', primes)
-primes.extend(teen_primes)
-print('primes has now become:', primes)
-primes.append(middle_aged_primes)
-print('primes has finally become:', primes)
-~~~
-{: .python}  
-~~~
-primes is currently: [2, 3, 5, 7, 9]
-primes has now become: [2, 3, 5, 7, 9, 11, 13, 17, 19]
-primes has finally become: [2, 3, 5, 7, 9, 11, 13, 17, 19, [37, 41, 43, 47]]
-~~~
-{: .output}
-Note that while `extend` maintains the "flat" structure of the list, appending a list to a list makes the result two-dimensional.
 
 ## Use `del` to remove items from a list entirely.
 

_episodes/12-for-loops.md

@@ -21,7 +21,7 @@ keypoints:
 ## A *for loop* executes commands once for each value in a collection.
 
 *   Doing calculations on the values in a list one by one
-    is as painful as working with `pressure_001`, `pressure_002`, etc.
+    is as painful as working with `temperature_001`, `temperature_002`, etc.
 *   A *for loop* tells Python to execute some statements once for each value in a list,
     a character string,
     or some other collection.