Minor formatting updates

Charlotte Weaver · Charlotte Weaver · commit a0f8f6664eb0 · 2016-07-15T09:54:09.000-04:00
diff --git a/Lesson04_Iteration/Iterations.ipynb b/Lesson04_Iteration/Iterations.ipynb
@@ -56,8 +56,8 @@
    },
    "outputs": [],
    "source": [
-    "# print count\n",
-    "# count += 5\n",
+    "print count\n",
+    "count += 5\n",
     "print count\n",
     "count *= 2\n",
     "print count"
@@ -133,7 +133,8 @@
    "source": [
     "## Infinite loops\n",
     "One thing you need to be careful of with while loops is the case where the condition never turns false. This means that the loop will keep going and going forever. You'll hear your computer's fan heat up and the program will hang. If you are doing any significant amount of programming, you will write an infinite loop, it cannot be helped. But watch out for them anyways.\n",
-    "\n"
+    "\n",
+    "**HINT** To stop an infinite loop in a jupyter notebook select Kernel->Restart from the menu above.\n"
    ]
   },
   {
@@ -288,6 +289,7 @@
    "source": [
     "while True:\n",
     "    user_message = raw_input('> ')\n",
+    "    # Leave when the user talks about snow.\n",
     "    if user_message == 'snow':\n",
     "        print \"I don't want to hear about that.\"\n",
     "        break\n",
@@ -307,6 +309,7 @@
     "while index < len(stock_up):\n",
     "    item = stock_up[index]\n",
     "    index += 1\n",
+    "    # Make sure we don't stock up on puppies\n",
     "    if item == 'puppies':\n",
     "        print \"No! We are not getting another puppy\"\n",
     "        continue\n",
@@ -434,13 +437,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {
     "collapsed": false
    },
    "outputs": [],
    "source": [
-    "words = ['Oh', 'the', 'weather', 'outside', 'is', 'frightful', 'But', 'the', 'fire', 'is', 'so', 'delightful']"
+    "words = ['Oh', 'the', 'weather', 'outside', 'is', 'frightful', 'But', 'the', 'fire', 'is', 'so', 'delightful']\n",
+    "# Your code goes here\n"
    ]
   },
   {
@@ -458,23 +462,23 @@
     "\n",
     "We are going to create a program that lets a user move N, S, E, or W and keeps track of their location. In phase two, we will introduce a treasure and let the user know if they found it.\n",
     "## Phase 1: wandering\n",
-    "1. Initialize two variables wanderer_x and wanderer_y to 0.\n",
+    "1. Initialize two variables `wanderer_x` and `wanderer_y` to 0.\n",
     "2. In an infinate while loop:\n",
-    "    - prompt the user \"Which direction would you like to travel in? (N, S, E, or W. done to quit)\" and store in a variable called direction\n",
-    "    - Update the user's location depending on their choice: add 1 to wanderer_x if E, subtract 1 from wanderer_x if W, add 1 to wanderer_y if N, subtract 1 from wanderer_y if S.\n",
+    "    - prompt the user \"Which direction would you like to travel in? (N, S, E, or W. done to quit)\" and store in a variable called `direction`\n",
+    "    - Update the user's location depending on their choice: add 1 to `wanderer_x` if E, subtract 1 from `wanderer_x` if W, add 1 to `wanderer_y` if N, subtract 1 from `wanderer_y` if S.\n",
     "    - If their response is 'done' break out of the loop.\n",
     "3. Tell the user their location \n",
     "\n",
     "## Phase 2: treasure\n",
-    "1. Initialize treasure_x and treasure_y to integers of your choice (don't make them too big or you'll have to spend too long to treasure hunt). Include this after you initialize the wanderer's location.\n",
+    "1. Initialize `treasure_x` and `treasure_y` to integers of your choice (don't make them too big or you'll have to spend too long to treasure hunt). Include this after you initialize the wanderer's location.\n",
     "2. In the while loop, after the user's location has been updated, if they are in the same location as the treasure, congratulate them and break out of the loop.\n",
     "\n",
     "## Phase 3: this was too easy\n",
     "Here are some ideas for how to improve your program.\n",
     "1. Make the location of the treasure random. ( x and y between -10 and 10)\n",
     "2. Set a time limit to find the treasure. Instead of an infinite loop, use a for loop from 0 - 50.\n",
     "3. Tell the user how far they walked d = sqrt( (x2 - x1)^2 + (y2 - y1)^2) **Hint** check the math module\n",
-    "4. You should probably make number 3 a function called distance that takes four parameters (x1, x2, y1, y2) and returns the distance.\n",
+    "4. You should probably make \\#3 a function called `distance` that takes four parameters (`x1`, `x2`, `y1`, `y2`) and returns the distance.\n",
     "5. Now that you have your distance formula see if you can make your program say 'warmer' or 'colder' depending on if their distance is closer or further from the treasure than last time (remember to store the last time).\n",
     "6. You might want to add some error checking for if the user say something besides N, S, E, W, or done. "
    ]
@@ -505,7 +509,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.10"
+   "version": "2.7.11"
   }
  },
  "nbformat": 4,
