diff --git a/level_1/a_user_instance.py b/level_1/a_user_instance.py index e5d0368..60e5607 100644 --- a/level_1/a_user_instance.py +++ b/level_1/a_user_instance.py @@ -12,7 +12,12 @@ def __init__(self, name: str, username: str, age: int, phone: str): self.age = age self.phone = phone + def __str__(self): + return f"Информация о пользователе: {self.name}, {self.username}, {self.age}, {self.phone}" -if __name__ == '__main__': - pass # код писать тут +if __name__ == "__main__": + user1 = User("Зинаида", "zinatut", 23, "+12023456789") + + +print(user1) diff --git a/level_1/b_student_full_name_method.py b/level_1/b_student_full_name_method.py index 14ec439..274c9c5 100644 --- a/level_1/b_student_full_name_method.py +++ b/level_1/b_student_full_name_method.py @@ -17,6 +17,8 @@ def get_full_name(self): return f"Student's full name: {self.surname}, {self.name}" -if __name__ == '__main__': - pass # код писать тут - +if __name__ == "__main__": + student1 = Student("Толя", "Пупкин", "Мичуренец", 123) + student1.get_full_name() + name = student1.get_full_name() + print(name) diff --git a/level_1/c_product_class.py b/level_1/c_product_class.py index 3952b66..7fb6bae 100644 --- a/level_1/c_product_class.py +++ b/level_1/c_product_class.py @@ -9,8 +9,16 @@ class Product: - pass # код писать тут + def __init__(self, name: str, description: str, price: float, weight: float): + self.name = name + self.description = description + self.price = price + self.weight = weight + def __str__(self): + return f"Информация о продукте: {self.name}, {self.description}, ${self.price}, {self.weight}kg" -if __name__ == '__main__': - pass # код писать тут + +if __name__ == "__main__": + product1 = Product("Sofa", "Not new but comfortable", 125.7, 65.9) + print(product1) diff --git a/level_1/d_bank_account_increase_balance.py b/level_1/d_bank_account_increase_balance.py index cc7a16c..eabe359 100644 --- a/level_1/d_bank_account_increase_balance.py +++ b/level_1/d_bank_account_increase_balance.py @@ -15,8 +15,11 @@ def __init__(self, owner_full_name: str, balance: float): self.balance = balance def increase_balance(self, income: float): - pass # код писать тут + self.balance += income -if __name__ == '__main__': - pass # код писать тут +if __name__ == "__main__": + your_account = BankAccount("Zina Netikova", 99.99) + print(your_account.balance) + your_account.increase_balance(99.99) + print(your_account.balance) diff --git a/level_1/e_bank_account_decrease_balance.py b/level_1/e_bank_account_decrease_balance.py index dfd4586..104ae7d 100644 --- a/level_1/e_bank_account_decrease_balance.py +++ b/level_1/e_bank_account_decrease_balance.py @@ -10,8 +10,22 @@ class BankAccount: - pass # код писать тут + def __init__(self, owner_full_name: str, balance: float): + self.owner_full_name = owner_full_name + self.balance = balance + def increase_balance(self, income: float): + self.balance += income -if __name__ == '__main__': - pass # код писать тут + def decrease_balance(self, outcome: float): + if self.balance > outcome: + self.balance -= outcome + else: + raise ValueError + + +if __name__ == "__main__": + your_account = BankAccount("Kolya Pupkin", 29.99) + your_account.decrease_balance(9) + print(your_account.balance) + your_account.decrease_balance(29)