Addressed Issues

Addressed issues raised after PyFun iteration

Author: emilygrabowski

lessons/Part1/00_workshop_setup.ipynb renamed to 00_workshop_setup.ipynb

@@ -33,7 +33,7 @@
     "\n",
     "## Coding Strategies\n",
     "\n",
-    "Planning ahead can help mitigate time spent dealing with bugs and errors in code. General steps for defensive coding are:\n",
+    "Planning ahead can help mitigate time spent dealing with bugs and errors in code. General steps for resilient coding are:\n",
     "\n",
     "1. State the goals of your code as clearly as possible.\n",
     "2. Plan out the general logic of steps needed to achieve the goal.\n",
@@ -75,13 +75,6 @@
     "\n",
     "Don't reinvent the wheel - learning how to find the answer to the issues you run into is a critical part of becoming a capable programmer!"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {

lessons/Part1/01_introduction.ipynb

@@ -20,7 +20,7 @@
    "source": [
     "## Navigating Jupyter Notebooks\n",
     "\n",
-    "In Jupyter Notebooks, code is divided into cells which can each be run separately. This is the main distinction between Jupyter Notebook `.ipynb` format and Python script `.py` format. Running a cell is done with a key combination: `Shift+Enter`. `Shift+Enter` will run the code in the selecte cell and then automatically move to the following cell.\n",
+    "In Jupyter Notebooks, code is divided into cells which can each be run separately. This is the main distinction between Jupyter Notebook `.ipynb` format and Python script `.py` format. Running a cell is done with a key combination: `Shift+Enter`. `Shift+Enter` will run the code in the selected cell and then automatically move to the following cell.\n",
     "\n",
     "Try to run the following code using `Shift+Enter` now. \n",
     "\n",
@@ -29,17 +29,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Hello World!\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "print(\"Hello World!\")"
    ]
@@ -57,17 +49,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "3\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "a = 1 + 2\n",
     "print(a)"
@@ -132,17 +116,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "And three shall be the count.\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "mystring = \"And three shall be the count.\" \n",
     "\n",
@@ -158,17 +134,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": null,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "And three shall be the count.\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "print(mystring)"
    ]
@@ -215,31 +183,6 @@
    "outputs": [],
    "source": []
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Commenting\n",
-    "\n",
-    "We will discuss how and why to comment code later in this series, but we will introduce it now because it's useful when you temporarily don't want to run a section of code.\n",
-    "\n",
-    "Simply place a pound sign `#` at the beginning of the line, and that line won't run. Any uncommented lines will be treated as code.\n",
-    "\n",
-    "Try running the cell below, then comment out `bad_thing`, and run it again. What changes?\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "good_thing = 1+1\n",
-    "\n",
-    "This line should be commented\n",
-    "bad_thing_1 = 'a' * 'b'"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

lessons/Part1/02_jupyter_notebooks.ipynb

@@ -57,22 +57,6 @@
     "print(\"Year:\", year, \".Month:\", month)"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "In addition, the argument `sep` (short for separator) can be used to control what goes in between each item."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print(\"Year:\", year, \". Month:\", month, sep = '')"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -83,8 +67,7 @@
     "\n",
     "*   Variable names **must** follow a few rules:\n",
     "    *   They cannot start with a digit.\n",
-    "    *   They cannot contain spaces, quotation marks, or other punctuation.\n",
-    "    *   They *may* contain an underscore (typically used to separate words in long variable names).\n",
+    "    *   They cannot contain spaces, quotation marks, or other punctuation (except underscore).\n",
     "    \n",
     "Not following these rules will result in an error in Python. \n",
     "\n",
@@ -178,7 +161,7 @@
    "source": [
     "## Challenge 2: Words to Code\n",
     "\n",
-    "Translate the following line into code and save the result to a variable. \n",
+    "Translate the following line into code and save the result to a variable. Start by writing out each operation as a separate step, *then* translate it to code.\n",
     "\n",
     "Divide 15 by the sum of a and three times b. Multiply the result by 2 and raise it to the 3rd power. What is the result?\n",
     "\n",
@@ -251,13 +234,6 @@
    "source": [
     "This is a common technique that is used for swapping variables around. However, often we might choose to just use new variables, rather than overwrite the ones here. Can you think of a reason why we might avoid overwriting a variable?"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {