From b64a802709069c1d92b07b874f13a7b5f1c595e9 Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Wed, 28 Apr 2021 18:09:49 +0300 Subject: [PATCH 1/6] Create task_2_flat --- task_2_flat | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 task_2_flat diff --git a/task_2_flat b/task_2_flat new file mode 100644 index 0000000..adf3fb8 --- /dev/null +++ b/task_2_flat @@ -0,0 +1,77 @@ +class Flat: + + def __init__(self, kitchen, bedroom, bathroom): + self.kitchen = kitchen + self.bedroom = bedroom + self.bathroom = bathroom + + def print_rooms(self): + print (f'{self.kitchen, self.bedroom, self.bedroom}') + + def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) + print(f'Flat {size}sq.m.') + + def print_kitchen_size(self, size): + print(f'{self.kitchen} {size}sq.m.') + + def print_bedroom_size(self, size): + print(f'{self.bedroom} {size}sq.m.') + + def print_bathroom_size(self, size): + print(f'{self.bathroom} {size}sq.m.') + + def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + return f'{kitchen_size + bathroom_size + bedroom_size}' + +class Room: + + def __init__(self, name, purpose): + self.name = name + self.purpose = purpose + + def __str__(self): + return f'{self.name} {self.purpose}' + + def get_size(self): + user_size = input(f'Enter size of {self.name} ') + print(f'{self.name} is {user_size}(sq.m.)') + + +class Kitchen(Room): + pass + +class Bedroom(Room): + pass + +class Bathroom(Room): + pass + +class BigBedroom(Room): + + def __str__(self): + return f'{self.name} Спальня с двуспальной кроватью' + +class GuestBedroom(Room): + + def __str__(self): + return f'{self.name} Гостевая спальня' + +class_f = Flat('kitchen', 'bedroom', 'bathroom') +class_f.print_rooms() +class_f.print_flat_size(4, 5, 6) +class_f.print_bathroom_size(6) + +class_k = Kitchen('kitchen', 'to eat') +print(class_k) +class_k.get_size() + +class_k = Bathroom('bathroom', 'to wash') +print(class_k) +class_k.get_size() + +class_bb = BigBedroom('big bedroom', 'to sleep') +print(class_bb) + +class_gb = GuestBedroom('guest bedroom', 'to sleep') +print(class_gb) From 49e2b96ac84cc8aa03b03f8203eb6f5fb911d0f9 Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Tue, 11 May 2021 11:49:16 +0300 Subject: [PATCH 2/6] Update task_2_flat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 Этап. --- task_2_flat | 95 ++++++++++++++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/task_2_flat b/task_2_flat index adf3fb8..a1c9430 100644 --- a/task_2_flat +++ b/task_2_flat @@ -5,73 +5,78 @@ class Flat: self.bedroom = bedroom self.bathroom = bathroom - def print_rooms(self): - print (f'{self.kitchen, self.bedroom, self.bedroom}') + #def print_rooms(self): + # print (f'{self.kitchen, self.bedroom, self.bedroom}') - def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): - size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) - print(f'Flat {size}sq.m.') + #def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + # size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) + # print(f'Flat {size}sq.m.') - def print_kitchen_size(self, size): - print(f'{self.kitchen} {size}sq.m.') + #def print_kitchen_size(self, size): + # print(f'{self.kitchen} {size}sq.m.') - def print_bedroom_size(self, size): - print(f'{self.bedroom} {size}sq.m.') + #def print_bedroom_size(self, size): + # print(f'{self.bedroom} {size}sq.m.') - def print_bathroom_size(self, size): - print(f'{self.bathroom} {size}sq.m.') + #def print_bathroom_size(self, size): + # print(f'{self.bathroom} {size}sq.m.') - def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): - return f'{kitchen_size + bathroom_size + bedroom_size}' + #def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + # return f'{kitchen_size + bathroom_size + bedroom_size}' -class Room: +#class Room: - def __init__(self, name, purpose): - self.name = name - self.purpose = purpose + #def __init__(self, name, purpose): + # self.name = name + # self.purpose = purpose - def __str__(self): - return f'{self.name} {self.purpose}' + #def __str__(self): + # return f'{self.name} {self.purpose}' - def get_size(self): - user_size = input(f'Enter size of {self.name} ') - print(f'{self.name} is {user_size}(sq.m.)') + #def get_size(self): + # user_size = input(f'Enter size of {self.name} ') + # print(f'{self.name} is {user_size}(sq.m.)') class Kitchen(Room): - pass + + TITLE = 'Kitchen' + + def __init__(self, size): + self.__size = size + self.__purpose = 'To eat' class Bedroom(Room): - pass + + TITLE = 'Bedroom' + + def __init__(self, size): + self.__size = size + self.__purpose = 'To sleep' class Bathroom(Room): - pass + + TITLE = 'Bathroom' + + def __init__(self, size): + self.__size = size + self.__purpose = 'To wash' -class BigBedroom(Room): +#class BigBedroom(Room): - def __str__(self): - return f'{self.name} Спальня с двуспальной кроватью' + #def __str__(self): + # return f'{self.name} Спальня с двуспальной кроватью' -class GuestBedroom(Room): +#class GuestBedroom(Room): - def __str__(self): - return f'{self.name} Гостевая спальня' + #def __str__(self): + # return f'{self.name} Гостевая спальня' -class_f = Flat('kitchen', 'bedroom', 'bathroom') -class_f.print_rooms() -class_f.print_flat_size(4, 5, 6) -class_f.print_bathroom_size(6) -class_k = Kitchen('kitchen', 'to eat') -print(class_k) -class_k.get_size() +my_kitchen = Kitchen(13) -class_k = Bathroom('bathroom', 'to wash') -print(class_k) -class_k.get_size() +my_bedroom = Bedroom(18) -class_bb = BigBedroom('big bedroom', 'to sleep') -print(class_bb) +my_bathroom = Bathroom(4) -class_gb = GuestBedroom('guest bedroom', 'to sleep') -print(class_gb) +my_flat = Flat(my_kitchen, my_bedroom, my_bathroom) From 6fe3d91cd00d86717f0dee59983a22d7caa3672d Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Thu, 13 May 2021 10:07:47 +0300 Subject: [PATCH 3/6] Update task_2_flat --- task_2_flat | 59 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/task_2_flat b/task_2_flat index a1c9430..2954a9a 100644 --- a/task_2_flat +++ b/task_2_flat @@ -5,24 +5,24 @@ class Flat: self.bedroom = bedroom self.bathroom = bathroom - #def print_rooms(self): - # print (f'{self.kitchen, self.bedroom, self.bedroom}') + def print_rooms(self): + print(f'{self.kitchen, self.bedroom, self.bedroom}') - #def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): - # size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) - # print(f'Flat {size}sq.m.') + def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + flat_size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) + print(f'Flat size: {flat_size}') - #def print_kitchen_size(self, size): - # print(f'{self.kitchen} {size}sq.m.') + def print_kitchen_size(self, size): + print(f'Kitchen size: {self.kitchen.get_size()}') - #def print_bedroom_size(self, size): - # print(f'{self.bedroom} {size}sq.m.') + def print_bedroom_size(self, size): + print(f'Bedroom size: {self.bedroom.get_size()}') - #def print_bathroom_size(self, size): - # print(f'{self.bathroom} {size}sq.m.') + def print_bathroom_size(self, size): + print(f'Bathroom size: {self.bathroom.get_size()}') - #def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): - # return f'{kitchen_size + bathroom_size + bedroom_size}' + def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + return f'{self.kitchen.get_size() + self.bathroom.get_size() + self.bedroom.get_size()}' #class Room: @@ -38,29 +38,38 @@ class Flat: # print(f'{self.name} is {user_size}(sq.m.)') -class Kitchen(Room): +class Kitchen: TITLE = 'Kitchen' def __init__(self, size): self.__size = size self.__purpose = 'To eat' + + def get_size(self): + return self.__size -class Bedroom(Room): +class Bedroom: TITLE = 'Bedroom' def __init__(self, size): self.__size = size self.__purpose = 'To sleep' + + def get_size(self): + return self.__size -class Bathroom(Room): +class Bathroom: TITLE = 'Bathroom' def __init__(self, size): self.__size = size self.__purpose = 'To wash' + + def get_size(self): + return self.__size #class BigBedroom(Room): @@ -72,11 +81,15 @@ class Bathroom(Room): #def __str__(self): # return f'{self.name} Гостевая спальня' +if __name__ == '__main__': -my_kitchen = Kitchen(13) - -my_bedroom = Bedroom(18) - -my_bathroom = Bathroom(4) - -my_flat = Flat(my_kitchen, my_bedroom, my_bathroom) + my_kitchen = Kitchen(13) + my_bedroom = Bedroom(18) + my_bathroom = Bathroom(4) + my_flat = Flat(my_kitchen, my_bedroom, my_bathroom) + + my_flat.print_rooms() + my_flat.print_flat_size(my_kitchen, my_bedroom, my_bathroom) + my_flat.print_kitchen_size(my_kitchen) + my_flat.print_bedroom_size(my_bedroom) + my_flat.print_bathroom_size(my_bathroom) From 19dc5ddf3b27e570d999e2140b3be8d4fa5040e0 Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Tue, 18 May 2021 10:14:31 +0300 Subject: [PATCH 4/6] Update task_2_flat --- task_2_flat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/task_2_flat b/task_2_flat index 2954a9a..0924c4d 100644 --- a/task_2_flat +++ b/task_2_flat @@ -6,10 +6,10 @@ class Flat: self.bathroom = bathroom def print_rooms(self): - print(f'{self.kitchen, self.bedroom, self.bedroom}') + print(f'{Kitchen.TITLE, Bedroom.TITLE, Bathroom.TITLE}') - def print_flat_size(self, kitchen_size, bedroom_size, bathroom_size): - flat_size = self._calculate_flat_size(kitchen_size, bedroom_size, bathroom_size) + def print_flat_size(self): + flat_size = self._calculate_flat_size() print(f'Flat size: {flat_size}') def print_kitchen_size(self, size): @@ -21,7 +21,7 @@ class Flat: def print_bathroom_size(self, size): print(f'Bathroom size: {self.bathroom.get_size()}') - def _calculate_flat_size(self, kitchen_size, bedroom_size, bathroom_size): + def _calculate_flat_size(self): return f'{self.kitchen.get_size() + self.bathroom.get_size() + self.bedroom.get_size()}' #class Room: @@ -89,7 +89,7 @@ if __name__ == '__main__': my_flat = Flat(my_kitchen, my_bedroom, my_bathroom) my_flat.print_rooms() - my_flat.print_flat_size(my_kitchen, my_bedroom, my_bathroom) + my_flat.print_flat_size() my_flat.print_kitchen_size(my_kitchen) my_flat.print_bedroom_size(my_bedroom) my_flat.print_bathroom_size(my_bathroom) From 4aea48ddd467e75da6972ca7626bed43c2074ee0 Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Thu, 27 May 2021 11:35:49 +0300 Subject: [PATCH 5/6] Update task_2_flat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Подзадание №1 --- task_2_flat | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/task_2_flat b/task_2_flat index 0924c4d..12aed57 100644 --- a/task_2_flat +++ b/task_2_flat @@ -24,52 +24,35 @@ class Flat: def _calculate_flat_size(self): return f'{self.kitchen.get_size() + self.bathroom.get_size() + self.bedroom.get_size()}' -#class Room: +class Room: - #def __init__(self, name, purpose): - # self.name = name - # self.purpose = purpose - - #def __str__(self): - # return f'{self.name} {self.purpose}' + def __init__(self, size): + self.__size = size - #def get_size(self): - # user_size = input(f'Enter size of {self.name} ') - # print(f'{self.name} is {user_size}(sq.m.)') + def get_size(self): + return self.__size -class Kitchen: - +class Kitchen(Room): TITLE = 'Kitchen' def __init__(self, size): - self.__size = size + super().__init__(size) self.__purpose = 'To eat' - - def get_size(self): - return self.__size - -class Bedroom: +class Bedroom(Room): TITLE = 'Bedroom' def __init__(self, size): - self.__size = size + super().__init__(size) self.__purpose = 'To sleep' - - def get_size(self): - return self.__size -class Bathroom: - +class Bathroom(Room): TITLE = 'Bathroom' def __init__(self, size): - self.__size = size + super().__init__(size) self.__purpose = 'To wash' - - def get_size(self): - return self.__size #class BigBedroom(Room): From 068d2373320ce1d5124ea8ca9665a98f42b7459b Mon Sep 17 00:00:00 2001 From: Yaroslav-GB <77726066+Yaroslav-GB@users.noreply.github.com> Date: Tue, 1 Jun 2021 11:04:43 +0300 Subject: [PATCH 6/6] Update task_2_flat --- task_2_flat | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/task_2_flat b/task_2_flat index 12aed57..90a6cdf 100644 --- a/task_2_flat +++ b/task_2_flat @@ -1,12 +1,14 @@ class Flat: - def __init__(self, kitchen, bedroom, bathroom): + def __init__(self, kitchen, bedroom, bathroom, bigbedroom, guestbedroom): self.kitchen = kitchen self.bedroom = bedroom self.bathroom = bathroom + self.bigbedroom = bigbedroom + self.guestbedroom = guestbedroom def print_rooms(self): - print(f'{Kitchen.TITLE, Bedroom.TITLE, Bathroom.TITLE}') + print(f'{Kitchen.TITLE, Bedroom.TITLE, Bathroom.TITLE, BigBedroom.TITLE, GuestBedroom.TITLE}') def print_flat_size(self): flat_size = self._calculate_flat_size() @@ -21,8 +23,15 @@ class Flat: def print_bathroom_size(self, size): print(f'Bathroom size: {self.bathroom.get_size()}') + def print_bigbedroom_size(self, size): + print(f'Bigbedroom size: {self.bigbedroom.get_size()}') + + def print_guestbedroom_size(self, size): + print(f'Guestbedroom size: {self.guestbedroom.get_size()}') + def _calculate_flat_size(self): - return f'{self.kitchen.get_size() + self.bathroom.get_size() + self.bedroom.get_size()}' + return f'{self.kitchen.get_size() + self.bathroom.get_size() + self.bedroom.get_size() + self.bigbedroom.get_size() + self.guestbedroom.get_size()}' + class Room: @@ -54,25 +63,40 @@ class Bathroom(Room): super().__init__(size) self.__purpose = 'To wash' -#class BigBedroom(Room): - #def __str__(self): - # return f'{self.name} Спальня с двуспальной кроватью' +class BigBedroom(Room): + TITLE = 'BigBedroom' + + def __init__(self, size): + super().__init__(size) + self.__purpose = 'Спальня с двуспальной кроватью' -#class GuestBedroom(Room): +class GuestBedroom(Room): + TITLE = 'GuestBedroom' + + def __init__(self, size): + super().__init__(size) + self.__purpose = 'Гостевая спальня' - #def __str__(self): - # return f'{self.name} Гостевая спальня' if __name__ == '__main__': my_kitchen = Kitchen(13) + my_bedroom = Bedroom(18) + my_bathroom = Bathroom(4) - my_flat = Flat(my_kitchen, my_bedroom, my_bathroom) - + + my_bigbedroom = BigBedroom(20) + + my_guestbedroom = GuestBedroom(21) + + my_flat = Flat(my_kitchen, my_bedroom, my_bathroom, my_guestbedroom, my_bigbedroom) + my_flat.print_rooms() my_flat.print_flat_size() my_flat.print_kitchen_size(my_kitchen) my_flat.print_bedroom_size(my_bedroom) my_flat.print_bathroom_size(my_bathroom) + my_flat.print_bigbedroom_size(my_bigbedroom) + my_flat.print_guestbedroom_size(my_guestbedroom)