diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb index 3142c5e..e2e115b 100644 --- a/lab-oop_in_python.ipynb +++ b/lab-oop_in_python.ipynb @@ -30,17 +30,27 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "200 15000\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(200, 15000) # 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)" @@ -87,7 +97,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -101,7 +111,9 @@ "source": [ "# Your code here\n", "class Bus(Vehicle):\n", - " pass\n", + " def __init__(self, seating_capacity=20, standing_capacity=10):\n", + " self.seating_capacity = seating_capacity\n", + " self.standing_capacity = standing_capacity\n", "\n", "# Example instantiation\n", "school_bus = Bus()\n", @@ -118,26 +130,34 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 23, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Base fare\n" + "110\n" ] } ], "source": [ "# Your code here\n", "class Vehicle:\n", + " def __init__(self, base_fare=100):\n", + " self.base_fare = base_fare \n", + " \n", " def fare(self):\n", - " return \"Base fare\"\n", + " return self.base_fare\n", "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include extra charges\n", - " pass\n", + " MAINTENANCE_CHARGE = 10\n", + "\n", + " def __init__(self, base_fare=100):\n", + " super().__init__(base_fare)\n", + "\n", + " def fare(self):\n", + " return super().fare() + Bus.MAINTENANCE_CHARGE\n", "\n", "school_bus = Bus()\n", "print(school_bus.fare()) # Expected output: \"Base fare with extra charge\"" @@ -153,7 +173,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 16, "metadata": {}, "outputs": [ { @@ -167,7 +187,7 @@ "source": [ "# Your code here\n", "class Vehicle:\n", - " color = \"White\" # Hint: Define color as a class attribute\n", + " COLOR = \"White\" # Hint: Define color as a class attribute\n", "\n", " def __init__(self, name, max_speed, mileage):\n", " self.name = name\n", @@ -175,7 +195,7 @@ " self.mileage = mileage\n", "\n", "school_bus = Vehicle(\"School Volvo\", 180, 12)\n", - "print(school_bus.color) # Expected output: \"White\"" + "print(school_bus.COLOR) # Expected output: \"White\"" ] }, { @@ -188,7 +208,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -211,9 +231,12 @@ " return self.capacity * 100\n", "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include maintenance charge\n", - " pass\n", + " def __init__(self, name, mileage, capacity):\n", + " super().__init__(name, mileage, capacity)\n", "\n", + " def fare(self):\n", + " return super().fare() * 1.1\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 +251,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 19, "metadata": {}, "outputs": [ { @@ -255,7 +278,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 20, "metadata": {}, "outputs": [ { @@ -287,7 +310,7 @@ ], "metadata": { "kernelspec": { - "display_name": ".venv", + "display_name": "base", "language": "python", "name": "python3" }, @@ -301,7 +324,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.0" + "version": "3.13.9" } }, "nbformat": 4,