diff --git a/lab-python-oop.ipynb b/lab-python-oop.ipynb index c13bc58..5216d21 100644 --- a/lab-python-oop.ipynb +++ b/lab-python-oop.ipynb @@ -56,21 +56,54 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 11, "id": "21625526-3fae-4c55-bab5-f91940070681", "metadata": {}, "outputs": [], "source": [ "# your code goes here\n", - "\n" + "class BankAccount:\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", + " if amount > 0:\n", + " self.balance += amount\n", + "\n", + " def withdraw(self, amount):\n", + " if amount > 0 and amount <= self.balance:\n", + " self.balance -= amount\n", + "\n", + " def get_balance(self):\n", + " return self.balance\n", + "\n", + " def get_account_number(self):\n", + " return self.account_number\n" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 12, "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", + "Account 2 balance after transactions: 500\n" + ] + } + ], "source": [ "# Testing the BankAccount class\n", "# Creating two instances of the BankAccount class with initial balances of 1000 and 500\n", @@ -117,12 +150,24 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 14, "id": "4f8848b5-05d3-4259-9e24-914537926778", "metadata": {}, "outputs": [], "source": [ - "# your code goes here" + "# your code goes here\n", + "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", + " interest = self.balance * self.interest_rate\n", + " self.balance += interest\n", + "\n", + " def get_interest_rate(self):\n", + " return self.interest_rate\n", + "\n" ] }, { @@ -151,12 +196,36 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 15, "id": "bccc7f6d-d58c-4909-9314-aaf4afc1cd30", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Current balance: 127.5\n", + "Interest rate: 0.02\n" + ] + } + ], "source": [ - "# your code goes here" + "# your code goes here\n", + "# Create a SavingsAccount object with a balance of $100 and interest rate of 2%\n", + "savings_account = SavingsAccount(100, 0.02)\n", + "\n", + "# Deposit $50 into the savings account\n", + "savings_account.deposit(50)\n", + "\n", + "# Withdraw $25 from the savings account\n", + "savings_account.withdraw(25)\n", + "\n", + "# Add interest to the savings account\n", + "savings_account.add_interest()\n", + "\n", + "# Print the current balance and interest rate of the savings account\n", + "print(\"Current balance:\", savings_account.get_balance()) # Expected output: 127.5\n", + "print(\"Interest rate:\", savings_account.get_interest_rate()) # Expected output: 0.02" ] }, { @@ -189,12 +258,40 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 16, "id": "3c883c6e-3cb8-4043-92d3-12409668a28e", "metadata": {}, "outputs": [], "source": [ - "# your code goes here" + "# your code goes here\n", + "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", + " super().withdraw(amount)\n", + " self.transaction_count += 1\n", + "\n", + " def deduct_fees(self):\n", + " total_fees = self.transaction_count * self.transaction_fee\n", + " if self.balance >= total_fees:\n", + " self.balance -= total_fees\n", + " print(f\"Deducted {total_fees} in transaction fees.\")\n", + " else:\n", + " print(\"Insufficient balance to deduct transaction fees.\")\n", + " self.transaction_count = 0\n", + "\n", + " def reset_transactions(self):\n", + " self.transaction_count = 0\n", + "\n", + " def get_transaction_count(self):\n", + " return self.transaction_count" ] }, { @@ -234,18 +331,59 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 17, "id": "faa5b148-c11b-4be0-b810-de8a7da81451", "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Deducted 4 in transaction fees.\n", + "Current balance: 546\n", + "Transaction count: 0\n", + "Deducted 4 in transaction fees.\n", + "Current balance: 667\n", + "Transaction count: 0\n" + ] + } + ], "source": [ - "# your code goes here" + "# your code goes here\n", + "# Create a new checking account with a balance of 500 dollars and a transaction fee of 2 dollars\n", + "checking_account = CheckingAccount(500, 2)\n", + "\n", + "# Deposit 100 dollars into the account\n", + "checking_account.deposit(100)\n", + "\n", + "# Withdraw 50 dollars from the account\n", + "checking_account.withdraw(50)\n", + "\n", + "# Deduct the transaction fees from the account\n", + "checking_account.deduct_fees()\n", + "\n", + "# Get the current balance and transaction count\n", + "print(\"Current balance:\", checking_account.get_balance()) # Expected output: 546\n", + "print(\"Transaction count:\", checking_account.get_transaction_count()) # Expected output: 0\n", + "\n", + "# Deposit 200 dollars into the account\n", + "checking_account.deposit(200)\n", + "\n", + "# Withdraw 75 dollars from the account\n", + "checking_account.withdraw(75)\n", + "\n", + "# Deduct the transaction fees from the account\n", + "checking_account.deduct_fees()\n", + "\n", + "# Get the current balance and transaction count again\n", + "print(\"Current balance:\", checking_account.get_balance()) # Expected output: 667\n", + "print(\"Transaction count:\", checking_account.get_transaction_count()) # Expected output: 0" ] } ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "base", "language": "python", "name": "python3" }, @@ -259,7 +397,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.13" + "version": "3.11.7" } }, "nbformat": 4,