diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb index 3142c5e..032747c 100644 --- a/lab-oop_in_python.ipynb +++ b/lab-oop_in_python.ipynb @@ -30,20 +30,30 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "240 18\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(240, 18) # 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)" + "print(modelX.max_speed, modelX.mileage) # Expected output: (240, 18)" ] }, { @@ -56,7 +66,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -74,6 +84,7 @@ "\n", "# Example instantiation\n", "my_vehicle = Vehicle()\n", + "# Print the type of the instance\n", "print(type(my_vehicle)) # Expected output: " ] }, @@ -87,7 +98,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 6, "metadata": {}, "outputs": [ { @@ -105,6 +116,7 @@ "\n", "# Example instantiation\n", "school_bus = Bus()\n", + "# Print the type of the instance \n", "print(type(school_bus)) # Expected output: " ] }, @@ -118,14 +130,14 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 7, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Base fare\n" + "Base fare with extra charge\n" ] } ], @@ -137,9 +149,11 @@ "\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", + "# Example instantiation \n", "school_bus = Bus()\n", + "# Print fare \n", "print(school_bus.fare()) # Expected output: \"Base fare with extra charge\"" ] }, @@ -153,7 +167,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -175,6 +189,7 @@ " self.mileage = mileage\n", "\n", "school_bus = Vehicle(\"School Volvo\", 180, 12)\n", + "# Print color attribute\n", "print(school_bus.color) # Expected output: \"White\"" ] }, @@ -188,33 +203,39 @@ }, { "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: 5500.0\n" ] } ], "source": [ "# Your code here\n", "class Vehicle:\n", + " # Hint: Define __init__ method with parameters for name, mileage, and capacity\n", " def __init__(self, name, mileage, capacity):\n", " self.name = name\n", " self.mileage = mileage\n", " self.capacity = capacity\n", - "\n", + " # Hint: Define fare method that calculates fare based on capacity\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", + " def fare(self):\n", + " base_fare = super().fare()\n", + " total_fare = base_fare + (0.1 * base_fare) # Adding 10% maintenance charge\n", + " return total_fare\n", "\n", "school_bus = Bus(\"School Volvo\", 12, 50)\n", + "# Print whether school_bus is an instance of Vehicle\n", + "print(isinstance(school_bus, Vehicle)) \n", "print(\"Total Bus fare is:\", school_bus.fare()) # Expected output: Total Bus fare is: (calculated amount)" ] }, @@ -228,7 +249,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -241,7 +262,9 @@ ], "source": [ "# Your code here\n", + "# Print whether school_bus is an instance of Vehicle\n", "school_bus = Bus(\"School Volvo\", 12, 50)\n", + "# Print the type of the instance\n", "print(type(school_bus)) # Expected output: " ] }, @@ -255,7 +278,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 10, "metadata": {}, "outputs": [ { @@ -268,6 +291,7 @@ ], "source": [ "# Your code here\n", + "# Print whether school_bus is an instance of Vehicle\n", "print(isinstance(school_bus, Vehicle)) # Expected output: True or False based on inheritance" ] }, @@ -287,7 +311,7 @@ ], "metadata": { "kernelspec": { - "display_name": ".venv", + "display_name": "base", "language": "python", "name": "python3" }, @@ -301,7 +325,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.0" + "version": "3.13.5" } }, "nbformat": 4,