From 121e03958dc17b9e7c8174f89c0f0837c310088c Mon Sep 17 00:00:00 2001 From: ehermakov Date: Mon, 21 Aug 2023 20:18:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0?= =?UTF-8?q?=D1=8E=20=D0=94=D0=97=20=D0=BF=D0=BE=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.idea/.gitignore | 3 + .../.idea/13082023 ДЗ по фигурам JSON.iml | 12 ++++ .../.idea/inspectionProfiles/profiles_settings.xml | 6 ++ .../.idea/misc.xml | 4 ++ .../.idea/modules.xml | 8 +++ .../13082023 ДЗ по фигурам JSON/.idea/vcs.xml | 6 ++ .../.idea/workspace.xml | 61 +++++++++++++++++++ .../13082023 ДЗ по фигурам JSON/Circle.py | 14 +++++ .../13082023 ДЗ по фигурам JSON/Rectangle.py | 14 +++++ .../13082023 ДЗ по фигурам JSON/Shape.py | 7 +++ .../13082023 ДЗ по фигурам JSON/Square.py | 13 ++++ 11 files changed, 148 insertions(+) create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/.gitignore create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/13082023 ДЗ по фигурам JSON.iml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/misc.xml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/modules.xml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/vcs.xml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/workspace.xml create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/Circle.py create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/Rectangle.py create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/Shape.py create mode 100644 HNS/Excercises/13082023 ДЗ по фигурам JSON/Square.py diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/.gitignore b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/13082023 ДЗ по фигурам JSON.iml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/13082023 ДЗ по фигурам JSON.iml new file mode 100644 index 0000000..8b8c395 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/13082023 ДЗ по фигурам JSON.iml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/inspectionProfiles/profiles_settings.xml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/misc.xml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/misc.xml new file mode 100644 index 0000000..9ed1625 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/modules.xml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/modules.xml new file mode 100644 index 0000000..db2ac21 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/vcs.xml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/workspace.xml b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/workspace.xml new file mode 100644 index 0000000..cb58285 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/.idea/workspace.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + 1692634383712 + + + + + + + \ No newline at end of file diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/Circle.py b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Circle.py new file mode 100644 index 0000000..9f938c4 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Circle.py @@ -0,0 +1,14 @@ +import math +from Shape import Shape + + +class Circle(Shape): + def __int__(self, radius, color): + self.radius = radius + self.color = color + + def area(self): + return math.pi * (self.radius ** 2) + + def perimetr(self): + return 2 * math.pi * self.radius diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/Rectangle.py b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Rectangle.py new file mode 100644 index 0000000..b48e319 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Rectangle.py @@ -0,0 +1,14 @@ +from Shape import Shape + + +class Rectangle(Shape): + def __int__(self, width, height, color): + self.width = width + self.height = height + self.color = color + + def area(self): + return self.width * self.height + + def perimetr(self): + return (self.width + self.height) * 2 diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/Shape.py b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Shape.py new file mode 100644 index 0000000..8f49981 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Shape.py @@ -0,0 +1,7 @@ + +class Shape: + def area(self): + return NotImplementedError("Необходимо переопределить метод area в дочернем классе") + + def perimetr(self): + return NotImplementedError("Необходимо переопределить метод perimetr в дочернем классе") diff --git a/HNS/Excercises/13082023 ДЗ по фигурам JSON/Square.py b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Square.py new file mode 100644 index 0000000..8feb881 --- /dev/null +++ b/HNS/Excercises/13082023 ДЗ по фигурам JSON/Square.py @@ -0,0 +1,13 @@ +from Shape import Shape + + +class Square(Shape): + def __int__(self, side, color): + self.side = side + self.color = color + + def area(self): + return self.side ** 2 + + def perimetr(self): + return 4 * self.side