diff --git a/lab-python-oop.ipynb b/lab-python-oop.ipynb index c13bc58..a0cb98c 100644 --- a/lab-python-oop.ipynb +++ b/lab-python-oop.ipynb @@ -56,39 +56,67 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 1, "id": "21625526-3fae-4c55-bab5-f91940070681", "metadata": {}, - "outputs": [], - "source": [ - "# your code goes here\n", - "\n" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "ee789466-d4cf-4dd8-b742-6863d42c3e5c", - "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Account 1 balance: 1000\n", + "Account 1 number: 1\n", + "Account 2 balance: 500\n", + "Account 2 number: 2\n", + "Account 1 balance after transactions: 1300\n", + "Insufficient balance\n", + "Account 2 balance after transactions: 500\n" + ] + } + ], "source": [ + "class BankAccount:\n", + " # Class attribute to keep track of account numbers\n", + " account_count = 0\n", + "\n", + " def __init__(self, initial_balance=0):\n", + " BankAccount.account_count += 1\n", + " self.account_number = BankAccount.account_count\n", + " self.balance = initial_balance\n", + "\n", + " def deposit(self, amount):\n", + " self.balance += amount\n", + "\n", + " def withdraw(self, amount):\n", + " if amount <= self.balance:\n", + " self.balance -= amount\n", + " else:\n", + " print(\"Insufficient balance\")\n", + "\n", + " def get_balance(self):\n", + " return self.balance\n", + "\n", + " def get_account_number(self):\n", + " return self.account_number\n", + "\n", + "\n", "# Testing the BankAccount class\n", - "# Creating two instances of the BankAccount class with initial balances of 1000 and 500\n", "account1 = BankAccount(1000)\n", "account2 = BankAccount(500)\n", "\n", - "print(\"Account 1 balance:\", account1.get_balance()) # This should print 1000\n", - "print(\"Account 1 number:\", account1.get_account_number()) # This should print 1\n", + "print(\"Account 1 balance:\", account1.get_balance()) # 1000\n", + "print(\"Account 1 number:\", account1.get_account_number()) # 1\n", "\n", - "print(\"Account 2 balance:\", account2.get_balance()) #This should print 500\n", - "print(\"Account 2 number:\", account2.get_account_number()) #This should print 2\n", + "print(\"Account 2 balance:\", account2.get_balance()) # 500\n", + "print(\"Account 2 number:\", account2.get_account_number()) # 2\n", "\n", - "account1.deposit(500) # We depoist 500 in the first account\n", - "account1.withdraw(200) # We withdraw 200 in the first account\n", - "print(\"Account 1 balance after transactions:\", account1.get_balance()) # This should print 1300\n", + "account1.deposit(500)\n", + "account1.withdraw(200)\n", + "print(\"Account 1 balance after transactions:\", account1.get_balance()) # 1300\n", "\n", - "account2.withdraw(600) # We withdraw 600 in the 2nd account \n", - "print(\"Account 2 balance after transactions:\", account2.get_balance())# This should print insufficient balance, and still 500 in funds" + "account2.withdraw(600) # Should print insufficient balance\n", + "print(\"Account 2 balance after transactions:\", account2.get_balance()) # 500\n", + "\n" ] }, { @@ -117,12 +145,41 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "id": "4f8848b5-05d3-4259-9e24-914537926778", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Current balance: 127.5\n", + "Interest rate: 0.02\n" + ] + } + ], "source": [ - "# your code goes here" + "class SavingsAccount(BankAccount):\n", + " def __init__(self, initial_balance=0, interest_rate=0.01):\n", + " super().__init__(initial_balance)\n", + " self.interest_rate = interest_rate\n", + "\n", + " def add_interest(self):\n", + " self.balance += self.balance * self.interest_rate\n", + "\n", + " def get_interest_rate(self):\n", + " return self.interest_rate\n", + "\n", + "\n", + "# Testing the SavingsAccount class\n", + "savings_account = SavingsAccount(100, 0.02)\n", + "\n", + "savings_account.deposit(50)\n", + "savings_account.withdraw(25)\n", + "savings_account.add_interest()\n", + "\n", + "print(\"Current balance:\", savings_account.get_balance()) # 127.5\n", + "print(\"Interest rate:\", savings_account.get_interest_rate()) # 0.02\n" ] }, { @@ -149,16 +206,6 @@ " Interest rate: 0.02" ] }, - { - "cell_type": "code", - "execution_count": null, - "id": "bccc7f6d-d58c-4909-9314-aaf4afc1cd30", - "metadata": {}, - "outputs": [], - "source": [ - "# your code goes here" - ] - }, { "cell_type": "markdown", "id": "a5455a88-a8d1-47a6-86b0-7c70647b4f31", @@ -189,12 +236,73 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 4, "id": "3c883c6e-3cb8-4043-92d3-12409668a28e", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Transaction fees of 4$ have been deducted from your account balance.\n", + "Current balance: 546\n", + "Transaction count: 0\n", + "Transaction fees of 4$ have been deducted from your account balance.\n", + "Current balance: 667\n", + "Transaction count: 0\n" + ] + } + ], "source": [ - "# your code goes here" + "class CheckingAccount(BankAccount):\n", + " def __init__(self, initial_balance=0, transaction_fee=1):\n", + " super().__init__(initial_balance)\n", + " self.transaction_fee = transaction_fee\n", + " self.transaction_count = 0\n", + "\n", + " def deposit(self, amount):\n", + " super().deposit(amount)\n", + " self.transaction_count += 1\n", + "\n", + " def withdraw(self, amount):\n", + " if amount <= self.balance:\n", + " super().withdraw(amount)\n", + " self.transaction_count += 1\n", + " else:\n", + " print(\"Insufficient balance\")\n", + "\n", + " def deduct_fees(self):\n", + " total_fees = self.transaction_count * self.transaction_fee\n", + " if total_fees <= self.balance:\n", + " self.balance -= total_fees\n", + " print(f\"Transaction fees of {total_fees}$ have been deducted from your account balance.\")\n", + " self.transaction_count = 0\n", + " else:\n", + " print(\"Insufficient funds to deduct transaction fees\")\n", + "\n", + " def reset_transactions(self):\n", + " self.transaction_count = 0\n", + "\n", + " def get_transaction_count(self):\n", + " return self.transaction_count\n", + "\n", + "\n", + "# Testing the CheckingAccount class\n", + "checking_account = CheckingAccount(500, 2)\n", + "\n", + "checking_account.deposit(100)\n", + "checking_account.withdraw(50)\n", + "checking_account.deduct_fees()\n", + "\n", + "print(\"Current balance:\", checking_account.get_balance()) # 546\n", + "print(\"Transaction count:\", checking_account.get_transaction_count()) # 0\n", + "\n", + "checking_account.deposit(200)\n", + "checking_account.withdraw(75)\n", + "checking_account.deduct_fees()\n", + "\n", + "print(\"Current balance:\", checking_account.get_balance()) # 667\n", + "print(\"Transaction count:\", checking_account.get_transaction_count()) # 0\n" ] }, { @@ -245,7 +353,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -259,7 +367,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.13" + "version": "3.12.6" } }, "nbformat": 4,