update 2023-2024

25aaa13c · chloebt · b6555a59 · 25aaa13c
Commit 25aaa13c authored 1 year ago by chloebt
--- a/notebooks/TP0_m2LiTL_BasicsOfPoo_2324.ipynb
+++ b/notebooks/TP0_m2LiTL_BasicsOfPoo_2324.ipynb
@@ -45,28 +45,10 @@
        "flash.present()"
      ],
      "metadata": {
-        "id": "H4jlq4Jk8txx",
-        "colab": {
-          "base_uri": "https://localhost:8080/"
-        },
-        "outputId": "510c8f08-7820-426f-aa25-9dd6224051c3"
+        "id": "H4jlq4Jk8txx"
      },
      "execution_count": null,
-      "outputs": [
-        {
-          "output_type": "execute_result",
-          "data": {
-            "text/plain": [
-              "'Hey! I am Flash McQueen, I am red and I appeared in 2006'"
-            ],
-            "application/vnd.google.colaboratory.intrinsic+json": {
-              "type": "string"
-            }
-          },
-          "metadata": {},
-          "execution_count": 2
-        }
-      ]
+      "outputs": []
    },
    {
      "cell_type": "code",
@@ -75,28 +57,10 @@
        "flash.present()"
      ],
      "metadata": {
-        "id": "8yZiyne39Yt7",
-        "colab": {
-          "base_uri": "https://localhost:8080/"
-        },
-        "outputId": "0e4c457e-259b-4d97-a171-a55c67195cfc"
+        "id": "8yZiyne39Yt7"
      },
      "execution_count": null,
-      "outputs": [
-        {
-          "output_type": "execute_result",
-          "data": {
-            "text/plain": [
-              "'Hey! I am Flash McQueen, I am purple and I appeared in 2006'"
-            ],
-            "application/vnd.google.colaboratory.intrinsic+json": {
-              "type": "string"
-            }
-          },
-          "metadata": {},
-          "execution_count": 3
-        }
-      ]
+      "outputs": []
    },
    {
      "cell_type": "markdown",
@@ -113,29 +77,10 @@
      "cell_type": "code",
      "source": [],
      "metadata": {
-        "id": "Kn3BotmnjegN",
-        "colab": {
-          "base_uri": "https://localhost:8080/",
-          "height": 35
-        },
-        "outputId": "a4d5ea5d-b476-4df8-b7a0-f99f3c9b9446"
+        "id": "Kn3BotmnjegN"
      },
      "execution_count": null,
-      "outputs": [
-        {
-          "output_type": "execute_result",
-          "data": {
-            "text/plain": [
-              "'Hey! I am Sally Carrera, I am blue and I appeared in 2006'"
-            ],
-            "application/vnd.google.colaboratory.intrinsic+json": {
-              "type": "string"
-            }
-          },
-          "metadata": {},
-          "execution_count": 5
-        }
-      ]
+      "outputs": []
    },
    {
      "cell_type": "markdown",
@@ -209,29 +154,16 @@
      "cell_type": "code",
      "source": [
        "# creation of an object variable or an instance\n",
-        "emy = Employee('emily', 42, 90000, 'happy manager')\n",
+        "\n",
        "\n",
        "# calling a function\n",
-        "emy.display()\n"
+        "\n"
      ],
      "metadata": {
-        "id": "OCUkIAdVo3LT",
-        "colab": {
-          "base_uri": "https://localhost:8080/"
-        },
-        "outputId": "3cb55ef2-0bac-4de0-86f7-e242ffd46494"
+        "id": "OCUkIAdVo3LT"
      },
-      "execution_count": null,
-      "outputs": [
-        {
-          "output_type": "stream",
-          "name": "stdout",
-          "text": [
-            "emily\n",
-            "42\n"
-          ]
-        }
-      ]
+      "execution_count": 2,
+      "outputs": []
    },
    {
      "cell_type": "code",

 %% Cell type:code id: tags:

 ``` 
 class Car:
  def __init__( self, name, color, year):
    self.name = name
    self.color = color
    self.year = year

  def present( self ):
    return 'Hey! I am '+self.name+', I am '+self.color+' and I appeared in '+str(self.year)

  def be_painted( self, new_color ):
    self.color = new_color

  def love( self, other_car ):
    return self.name+' is in love with '+other_car.name
 ```

 %% Cell type:code id: tags:

 ``` 
 flash = Car( 'Flash McQueen', 'red', 2006 )
 flash.present()
 ```

-%% Output
-
-    'Hey! I am Flash McQueen, I am red and I appeared in 2006'
-
 %% Cell type:code id: tags:

 ``` 
 flash.be_painted( 'purple' )
 flash.present()
 ```

-%% Output
-
-    'Hey! I am Flash McQueen, I am purple and I appeared in 2006'
-
 %% Cell type:markdown id: tags:

 ## Exercise:
 - define a new object of type Car with the following attributes: its name is Sally Carrera, its color is blue and it has the same year as the object my_car.
 - call the method love of the Car class with Flash and Sally.

 %% Cell type:code id: tags:

 ``` 
 ```

-%% Output
-
-    'Hey! I am Sally Carrera, I am blue and I appeared in 2006'
-
 %% Cell type:markdown id: tags:

 ## Inheritance

 https://www.geeksforgeeks.org/python-oops-concepts/#:~:text=In%20Python%2C%20object%2Doriented%20Programming,%2C%20etc.%20in%20the%20programming.

 %% Cell type:code id: tags:

 ``` 
 # Parent class
 class Person(object):

 	# __init__ is known as the constructor
 	def __init__(self, name, idnumber):
 		self.name = name
 		self.idnumber = idnumber

 	def display(self):
 		print(self.name)
 		print(self.idnumber)

 	def details(self):
 		print("My name is {}".format(self.name))
 		print("IdNumber: {}".format(self.idnumber))
 ```

 %% Cell type:code id: tags:

 ``` 
 # child class
 class Employee(Person):
    def __init__(self, name, idnumber, salary, post):
        super().__init__(name, idnumber )
        self.salary = salary
        self.post = post

    def details(self):
        print("My name is {}".format(self.name))
        print("IdNumber: {}".format(self.idnumber))
        print("Post: {}".format(self.post))
 ```

 %% Cell type:markdown id: tags:

 ## Exercise:
 - Create an object of the class Employee
 - Print his name and id number.

 %% Cell type:code id: tags:

 ``` 
 # creation of an object variable or an instance
-emy = Employee('emily', 42, 90000, 'happy manager')

-# calling a function
-emy.display()
-```

-%% Output
+# calling a function

-    emily
-    42
+```

 %% Cell type:code id: tags:

 ``` 
 ```