diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb index 3142c5e..24097db 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": [ + "250 8\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: int, mileage: int):\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(250, 8) # 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 +66,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -70,7 +80,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 +98,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 9, "metadata": {}, "outputs": [ { @@ -101,7 +112,8 @@ "source": [ "# Your code here\n", "class Bus(Vehicle):\n", - " pass\n", + " def __init__(self):\n", + " pass\n", "\n", "# Example instantiation\n", "school_bus = Bus()\n", @@ -118,14 +130,14 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 12, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Base fare\n" + "Base fare with extra charge\n" ] } ], @@ -136,8 +148,11 @@ " return \"Base fare\"\n", "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include extra charges\n", - " pass\n", + " def __init__(Vehicle):\n", + " pass\n", + "\n", + " def fare(self):\n", + " return \"Base fare with extra charge\"\n", "\n", "school_bus = Bus()\n", "print(school_bus.fare()) # Expected output: \"Base fare with extra charge\"" @@ -153,7 +168,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -167,12 +182,13 @@ "source": [ "# Your code here\n", "class Vehicle:\n", - " color = \"White\" # Hint: Define color as a class attribute\n", + " DEFAULT_COLOR = \"White\" # Hint: Define color as a class attribute\n", "\n", - " def __init__(self, name, max_speed, mileage):\n", + " def __init__(self, name, max_speed, mileage, color=DEFAULT_COLOR):\n", " self.name = name\n", " self.max_speed = max_speed\n", " self.mileage = mileage\n", + " self.color = color\n", "\n", "school_bus = Vehicle(\"School Volvo\", 180, 12)\n", "print(school_bus.color) # Expected output: \"White\"" @@ -188,14 +204,14 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 17, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Total Bus fare is: 5000\n" + "Total Bus fare is: 5500.0\n" ] } ], @@ -211,8 +227,16 @@ " return self.capacity * 100\n", "\n", "class Bus(Vehicle):\n", - " # Hint: Override fare method to include maintenance charge\n", - " pass\n", + "\n", + " MAINTENANCE_CHARGE_DEFAULT = 0.1\n", + "\n", + " def __init__(self, name, mileage, capacity):\n", + " super().__init__(name, mileage, capacity)\n", + " \n", + " def fare(self):\n", + " base_fare = super().fare()\n", + " maintenance_charge = base_fare * self.MAINTENANCE_CHARGE_DEFAULT\n", + " return base_fare + maintenance_charge\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 +252,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 18, "metadata": {}, "outputs": [ { @@ -255,7 +279,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 19, "metadata": {}, "outputs": [ { @@ -287,7 +311,7 @@ ], "metadata": { "kernelspec": { - "display_name": ".venv", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -301,7 +325,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.0" + "version": "3.13.7" } }, "nbformat": 4,