Exercises were done already

Author: maleckicoa

lab-oop_in_python.ipynb

@@ -32,16 +32,31 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "100"
+      ]
+     },
+     "execution_count": 15,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "# Your code here\n",
     "class Vehicle:\n",
-    "    # Hint: Define __init__ method with parameters for max_speed and mileage\n",
-    "    pass\n",
+    "    color = 'red'\n",
+    "    def __init__(self, max_speed, mileage):\n",
+    "        self.max_speed = max_speed\n",
+    "        self.mileage = mileage\n",
+    "        # Hint: Define __init__ method with parameters for max_speed and mileage\n",
+    "        pass\n",
     "\n",
     "# Example instantiation\n",
-    "modelX = Vehicle()  # Create an instance of Vehicle\n",
-    "\n",
+    "modelX = Vehicle(max_speed= 100, mileage = 1000)  # Create an instance of Vehicle\n",
+    "modelX.max_speed\n",
     "# Print attributes\n",
     "print(modelX.max_speed, modelX.mileage)  # Expected output: (value of max_speed, value of mileage)"
    ]
@@ -56,7 +71,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -87,7 +102,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -118,28 +133,31 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 26,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Base fare\n"
+      "Base Fare + 100$\n"
      ]
     }
    ],
    "source": [
     "# Your code here\n",
     "class Vehicle:\n",
-    "    def fare(self):\n",
+    "    def fare1(self):\n",
     "        return \"Base fare\"\n",
     "\n",
     "class Bus(Vehicle):\n",
-    "    # Hint: Override fare method to include extra charges\n",
-    "    pass\n",
+    "    def __init__(self, maintenance):\n",
+    "        self.maintenance = maintenance\n",
     "\n",
-    "school_bus = Bus()\n",
+    "    def fare(self):\n",
+    "         return f\"Base Fare + {self.maintenance}\"\n",
+    "\n",
+    "school_bus = Bus(maintenance = '100$')\n",
     "print(school_bus.fare())  # Expected output: \"Base fare with extra charge\""
    ]
   },
@@ -153,7 +171,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -188,13 +206,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 36,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Total Bus fare is: 5500.0\n",
       "Total Bus fare is: 5000\n"
      ]
     }
@@ -211,11 +230,17 @@
     "        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, maintenance):\n",
+    "        super().__init__( name, mileage, capacity)\n",
+    "        self.maintenance = maintenance\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)"
+    "    def fare(self):\n",
+    "        return super().fare() * (1+self.maintenance)\n",
+    "\n",
+    "vehicle = Vehicle(\"School Volvo\", 12, 50)\n",
+    "school_bus = Bus(\"School Volvo\", 12, 50, 0.1)\n",
+    "print(\"Total Bus fare is:\", school_bus.fare())  # Expected output: Total Bus fare is: (calculated amount)\n",
+    "print(\"Total Bus fare is:\", vehicle.fare())  # Expected output: Total Bus fare is: (calculated amount)"
    ]
   },
   {
@@ -228,7 +253,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -255,7 +280,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -287,7 +312,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "base",
    "language": "python",
    "name": "python3"
   },
@@ -301,7 +326,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.0"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,