diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb index 3142c5e..0e5fb0f 100644 --- a/lab-oop_in_python.ipynb +++ b/lab-oop_in_python.ipynb @@ -20,6 +20,13 @@ "- Use the hints provided if you get stuck." ] }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] + }, { "cell_type": "markdown", "metadata": {}, @@ -32,15 +39,24 @@ "cell_type": "code", "execution_count": null, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "120 0\n" + ] + } + ], "source": [ "# Your code here\n", "class Vehicle:\n", - " # Hint: Define __init__ method with parameters for max_speed and mileage\n", - " pass\n", + " def __init__(self, max_speed, mileage):\n", + " self.max_speed = max_speed\n", + " self.mileage = mileage \n", "\n", "# Example instantiation\n", - "modelX = Vehicle() # Create an instance of Vehicle\n", + "modelX = Vehicle(120, 0) # Create an instance of Vehicle\n", "\n", "# Print attributes\n", "print(modelX.max_speed, modelX.mileage) # Expected output: (value of max_speed, value of mileage)" @@ -56,7 +72,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -70,7 +86,8 @@ "source": [ "# Your code here\n", "class Vehicle:\n", - " pass\n", + " def __init__(self):\n", + " pass\n", "\n", "# Example instantiation\n", "my_vehicle = Vehicle()\n", @@ -87,7 +104,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -101,10 +118,13 @@ "source": [ "# Your code here\n", "class Bus(Vehicle):\n", - " pass\n", - "\n", + " def __init__(self, max_speed, mileage):\n", + " self.max_speed = max_speed\n", + " self.mileage = mileage \n", + " super().__init__(max_speed, mileage)\n", + " \n", "# Example instantiation\n", - "school_bus = Bus()\n", + "school_bus = Bus(60, 10000)\n", "print(type(school_bus)) # Expected output: " ] }, @@ -118,26 +138,39 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Base fare\n" + "Base fare with extra charge\n" ] } ], "source": [ "# Your code here\n", "class Vehicle:\n", + " def __init__(self, max_speed, mileage):\n", + " self.max_speed = max_speed\n", + " self.mileage = mileage \n", + "\n", " def fare(self):\n", " return \"Base fare\"\n", "\n", "class Bus(Vehicle):\n", + " def __init__(self, max_speed, mileage):\n", + " self.max_speed = max_speed\n", + " self.mileage = mileage \n", + "\n", + " def fare(self):\n", + " super().fare() \n", + " return \"Base fare with extra charge\"\n", + " \n", + "\n", " # Hint: Override fare method to include extra charges\n", - " pass\n", + " \n", "\n", "school_bus = Bus()\n", "print(school_bus.fare()) # Expected output: \"Base fare with extra charge\"" @@ -153,7 +186,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -188,14 +221,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Total Bus fare is: 5000\n" + "Total Bus fare is: \"Total Bus fare is:\" 5.0\n" ] } ], @@ -211,8 +244,16 @@ " return self.capacity * 100\n", "\n", "class Bus(Vehicle):\n", + " def __init__(self, name, mileage, capacity):\n", + " self.name = name\n", + " self.mileage = mileage\n", + " self.capacity = capacity\n", + "\n", + " def fare(self):\n", + " super().fare() \n", + " return f'\"Total Bus fare is:\" {self.capacity * .10}' \n", " # Hint: Override fare method to include maintenance charge\n", - " pass\n", + "\n", "\n", "school_bus = Bus(\"School Volvo\", 12, 50)\n", "print(\"Total Bus fare is:\", school_bus.fare()) # Expected output: Total Bus fare is: (calculated amount)" @@ -228,7 +269,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 15, "metadata": {}, "outputs": [ { @@ -255,7 +296,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 18, "metadata": {}, "outputs": [ { @@ -268,6 +309,12 @@ ], "source": [ "# Your code here\n", + "def isinstance(obj, class_name):\n", + " if type(obj).__name__ == \"Bus\":\n", + " return True\n", + " else:\n", + " return False\n", + "\n", "print(isinstance(school_bus, Vehicle)) # Expected output: True or False based on inheritance" ] }, @@ -287,7 +334,7 @@ ], "metadata": { "kernelspec": { - "display_name": ".venv", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -301,7 +348,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.0" + "version": "3.9.6" } }, "nbformat": 4,