diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb index 3142c5e..20fb31b 100644 --- a/lab-oop_in_python.ipynb +++ b/lab-oop_in_python.ipynb @@ -30,17 +30,28 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "130 23\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", "\n", "# Example instantiation\n", - "modelX = Vehicle() # Create an instance of Vehicle\n", + "modelX = Vehicle(130,23) # 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 +67,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 5, "metadata": {}, "outputs": [ { @@ -87,7 +98,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 20, "metadata": {}, "outputs": [ { @@ -101,10 +112,12 @@ "source": [ "# Your code here\n", "class Bus(Vehicle):\n", - " pass\n", + " def __inint__(self,max_speed,mileage,passengers):\n", + " super().__init__(max_speed, mileage)\n", + " self.passengers = passengers\n", "\n", "# Example instantiation\n", - "school_bus = Bus()\n", + "school_bus = Bus(80,15,25)\n", "print(type(school_bus)) # Expected output: " ] }, @@ -118,14 +131,14 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 22, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Base fare\n" + "Base fare with extra charge\n" ] } ], @@ -134,13 +147,12 @@ "class Vehicle:\n", " def fare(self):\n", " return \"Base fare\"\n", - "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include extra charges\n", - " pass\n", - "\n", + " def fare(self):\n", + " return \"Base fare with extra charge\"\n", "school_bus = Bus()\n", - "print(school_bus.fare()) # Expected output: \"Base fare with extra charge\"" + "print(school_bus.fare()) # Base fare with extra charge\n", + "\n" ] }, { @@ -153,7 +165,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -188,14 +200,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 23, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Total Bus fare is: 5000\n" + "Total Bus fare is: 5500.0\n" ] } ], @@ -206,16 +218,13 @@ " self.name = name\n", " self.mileage = mileage\n", " self.capacity = capacity\n", - "\n", " def fare(self):\n", " return self.capacity * 100\n", - "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include maintenance charge\n", - " pass\n", - "\n", + " def fare(self):\n", + " return super().fare() * 1.1\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)" + "print(\"Total Bus fare is:\", school_bus.fare()) " ] }, { @@ -228,7 +237,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 15, "metadata": {}, "outputs": [ { @@ -255,7 +264,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 16, "metadata": {}, "outputs": [ { @@ -287,7 +296,7 @@ ], "metadata": { "kernelspec": { - "display_name": ".venv", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -301,7 +310,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.0" + "version": "3.11.5" } }, "nbformat": 4,