W5: clean up, mention encapsulation and abstraction

Author: tomasff

week5/w5.ipynb

@@ -15,7 +15,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "In this lecture we will aim to cover:\n",
+    "In this lecture we aim to cover:\n",
     "- OOP\n",
     "- Decorators"
    ]
@@ -307,7 +307,6 @@
     "my_person = Person(\"donald knuth\", 84, \"computer scientist\")\n",
     "my_person.introduce()\n",
     "\n",
-    "\n",
     "# DO NOT MODIFY\n",
     "assert my_person.eat(\"pasta\") == \"donald knuth is eating pasta\", \"Test failed: Something went wrong, expected 'donald knuth is eating pasta'\""
    ]
@@ -316,7 +315,10 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "We can now represent a person with attributes name, age, and profession. We can introduce a person, and a person can eat."
+    "We can now represent a person with attributes name, age, and profession. We can introduce a person, and a person can eat.\n",
+    "This brings us to one of the core principles associated with OOP, **encapsulation**: the object's methods and attributes\n",
+    "are bundled as a single-unit. We also **abstract** away the implementation details of each method. As a programmer you can invoke `eat`\n",
+    "or `introduce` without having to worry about what's going on in the background."
    ]
   },
   {
@@ -465,8 +467,8 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Intermission: Decorators\n",
-    "Before we continue exploring object-oriented programming, let's have a look at decorators.\n",
+    "# Decorators\n",
+    "Finally, let's have a look at decorators.\n",
     "\n",
     "Congratulations, you've just been hired by the *National X-Soc Co-op Bank Ltd* to develop their ATM system!\n",
     "\n",
@@ -600,28 +602,6 @@
     "For now, you don't need to worry about the implementation details. The important part is understanding what decorators do: modify the behavior of an existing function."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "**[INSERT diagram for class vs object]**"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "TBD:\n",
-    "- polymorphism/abstraction/encapsulation a little bit\n",
-    "- then intermission on anotations\n",
-    "- static and class methods"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": []
-  },
   {
    "cell_type": "markdown",
    "metadata": {},