From df80a905f3d97de77a148a701978dfd510fdb81b Mon Sep 17 00:00:00 2001
From: G-aldughmani <143170028+G-aldughmani@users.noreply.github.com>
Date: Sun, 23 Feb 2025 15:16:01 +0300
Subject: [PATCH 1/2] oop lab

---
 lab-oop_in_python.ipynb | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb
index 3142c5e..43e8582 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 140\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,140)  # 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)"
@@ -118,7 +128,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -153,7 +163,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -188,7 +198,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -228,7 +238,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -255,7 +265,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -287,7 +297,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -301,7 +311,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.0"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

From 4a3a78de559756b00852fde2768dbe894ce39275 Mon Sep 17 00:00:00 2001
From: G-aldughmani <143170028+G-aldughmani@users.noreply.github.com>
Date: Sun, 23 Feb 2025 15:28:49 +0300
Subject: [PATCH 2/2] updated

---
 lab-oop_in_python.ipynb | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lab-oop_in_python.ipynb b/lab-oop_in_python.ipynb
index 43e8582..1d9cc9d 100644
--- a/lab-oop_in_python.ipynb
+++ b/lab-oop_in_python.ipynb
@@ -30,7 +30,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -66,7 +66,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
@@ -97,7 +97,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -128,14 +128,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Base fare\n"
+      "Base fare with extra charge\n"
      ]
     }
    ],
@@ -146,8 +146,8 @@
     "        return \"Base fare\"\n",
     "\n",
     "class Bus(Vehicle):\n",
-    "    # Hint: Override fare method to include extra charges\n",
-    "    pass\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\""
@@ -163,7 +163,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -198,14 +198,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Total Bus fare is: 5000\n"
+      "Total Bus fare is: 5500.0\n"
      ]
     }
    ],
@@ -221,8 +221,10 @@
     "        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",
+    "        original_fare = super().fare()\n",
+    "        return original_fare + original_fare * 0.1\n",
+    "\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)"
@@ -238,7 +240,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -265,7 +267,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {