From 6866b9f4f75d94da32ffffd036b4f29ecb0b97e8 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 20 Sep 2024 18:43:43 +0300 Subject: [PATCH 01/24] Added new file --- rectangle.py | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 rectangle.py diff --git a/rectangle.py b/rectangle.py new file mode 100644 index 0000000000..eb68866750 --- /dev/null +++ b/rectangle.py @@ -0,0 +1,5 @@ +def area(a, b): + return a * b + +def perimeter(a, b): + return a + b From 975bb11d2ad41a2b449c59d61822aec168ced62e Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 20 Sep 2024 18:47:11 +0300 Subject: [PATCH 02/24] Fixed mistaked --- rectangle.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rectangle.py b/rectangle.py index eb68866750..a6e8f19256 100644 --- a/rectangle.py +++ b/rectangle.py @@ -2,4 +2,5 @@ def area(a, b): return a * b def perimeter(a, b): - return a + b + return 2 *(a + b) + From cae725f6f0f09d853e3be8cac7b344ed26a091f7 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Sat, 28 Sep 2024 01:46:53 +0300 Subject: [PATCH 03/24] 28/09/2024 --- triangle.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 triangle.py diff --git a/triangle.py b/triangle.py new file mode 100644 index 0000000000..986ece05a0 --- /dev/null +++ b/triangle.py @@ -0,0 +1,7 @@ +# area of triangle +def area(a, h): + return a * h / 2 + +#perimeter of triangle +def perimeter(a, b, c): + return a + b + c From 0873e73c02b07b0b40ffff8836a080378726df31 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Thu, 3 Oct 2024 16:18:59 +0300 Subject: [PATCH 04/24] adding comment to triangle.py --- triangle.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/triangle.py b/triangle.py index 986ece05a0..01ad2f9a66 100644 --- a/triangle.py +++ b/triangle.py @@ -1,7 +1 @@ -# area of triangle -def area(a, h): - return a * h / 2 - -#perimeter of triangle -def perimeter(a, b, c): - return a + b + c + \ No newline at end of file From 415b78632d2a32db02e9b42b20ae8e11028b9d68 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Thu, 3 Oct 2024 16:27:14 +0300 Subject: [PATCH 05/24] adding comment to rectangle.py --- rectangle.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/rectangle.py b/rectangle.py index a6e8f19256..0519ecba6e 100644 --- a/rectangle.py +++ b/rectangle.py @@ -1,6 +1 @@ -def area(a, b): - return a * b - -def perimeter(a, b): - return 2 *(a + b) - + \ No newline at end of file From 57a71a3bf4c01b38dec2617f85da3dd925d11205 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 4 Oct 2024 00:10:23 +0300 Subject: [PATCH 06/24] Adding comment to rectangle.py --- rectangle.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 rectangle.py diff --git a/rectangle.py b/rectangle.py deleted file mode 100644 index 0519ecba6e..0000000000 --- a/rectangle.py +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From d1a7b8fa8b938ab2bdf12553f277cbe50b749ad9 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 4 Oct 2024 00:20:50 +0300 Subject: [PATCH 07/24] Adding comment to triangle.py --- triangle.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/triangle.py b/triangle.py index 01ad2f9a66..cda39793ef 100644 --- a/triangle.py +++ b/triangle.py @@ -1 +1,10 @@ - \ No newline at end of file +def area_triangle(a, h): + """ + Принимает сторону треугольника a и высоту h, опирающуюся на сторону a, + возвращает площадь треугольника + """ + return a * h / 2 + +def perimeter_triangle(a, b, c): + """Принимает стороны треугольника a,b,c, возвращает его периметр""" + return a + b + c \ No newline at end of file From efd25b782129a4dd939eba785ed561d98bf76dfe Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 4 Oct 2024 00:23:17 +0300 Subject: [PATCH 08/24] Adding comment to rectangle.py --- rectangle.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 rectangle.py diff --git a/rectangle.py b/rectangle.py new file mode 100644 index 0000000000..0980d6e7b9 --- /dev/null +++ b/rectangle.py @@ -0,0 +1,7 @@ +def area_rectangle(a, b): + """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" + return a * b + +def perimeter_rectangle(a, b): + """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" + return 2*(a + b) \ No newline at end of file From c7702232227158abf016b41048f8ac5b00fb0077 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 4 Oct 2024 00:24:10 +0300 Subject: [PATCH 09/24] Adding comment to square.py --- square.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/square.py b/square.py index 0f98724205..9d18dd16a3 100644 --- a/square.py +++ b/square.py @@ -1,7 +1,7 @@ - -def area(a): +def area_square(a): + """Принимает сторону квадрата a, возвращает его площадь""" return a * a - -def perimeter(a): - return 4 * a +def perimeter_square(a): + """Принимает сторону квадрата a, возвращает его периметр""" + return 4 * a \ No newline at end of file From 1fd844cb652ce232a81c90217054d8f382acd0f7 Mon Sep 17 00:00:00 2001 From: "nvchinh23022004@gmail.com" Date: Fri, 4 Oct 2024 00:25:14 +0300 Subject: [PATCH 10/24] Adding comment to circle.py --- circle.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/circle.py b/circle.py index c3eb8647c9..5ecf2d4ddd 100644 --- a/circle.py +++ b/circle.py @@ -1,10 +1,11 @@ import math +import unittest - -def area(r): +def area_circle(r): + '''Принимает число r-радиус окружности, возвращает её площадь''' return math.pi * r * r -def perimeter(r): - return 2 * math.pi * r - +def perimeter_circle(r): + '''Принимает число r-радиус окружности, возвращает её длину''' + return 2 * math.pi * r \ No newline at end of file From ceaf7ab5c05801ea926ca47a446d75a67fe24015 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 11:16:41 +0300 Subject: [PATCH 11/24] Adding comment to rectangle.py --- rectangle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rectangle.py b/rectangle.py index 0980d6e7b9..01de92af94 100644 --- a/rectangle.py +++ b/rectangle.py @@ -4,4 +4,4 @@ def area_rectangle(a, b): def perimeter_rectangle(a, b): """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" - return 2*(a + b) \ No newline at end of file + return 2*(a + b) From 35b21816d0bcdd156bd79b185342f6c9315790e2 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 13:22:05 +0300 Subject: [PATCH 12/24] adding comment to rectangle.py --- rectangle.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rectangle.py b/rectangle.py index 01de92af94..0519ecba6e 100644 --- a/rectangle.py +++ b/rectangle.py @@ -1,7 +1 @@ -def area_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" - return a * b - -def perimeter_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" - return 2*(a + b) + \ No newline at end of file From c771d335aa477310db4d053780ad2ec484808148 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 13:23:03 +0300 Subject: [PATCH 13/24] adding comment to triangle.py --- triangle.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/triangle.py b/triangle.py index cda39793ef..0519ecba6e 100644 --- a/triangle.py +++ b/triangle.py @@ -1,10 +1 @@ -def area_triangle(a, h): - """ - Принимает сторону треугольника a и высоту h, опирающуюся на сторону a, - возвращает площадь треугольника - """ - return a * h / 2 - -def perimeter_triangle(a, b, c): - """Принимает стороны треугольника a,b,c, возвращает его периметр""" - return a + b + c \ No newline at end of file + \ No newline at end of file From 5e97c4b409bd2462994af4cb4195f48091d2fc43 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 13:24:19 +0300 Subject: [PATCH 14/24] adding comment to square.py --- square.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/square.py b/square.py index 9d18dd16a3..0519ecba6e 100644 --- a/square.py +++ b/square.py @@ -1,7 +1 @@ -def area_square(a): - """Принимает сторону квадрата a, возвращает его площадь""" - return a * a - -def perimeter_square(a): - """Принимает сторону квадрата a, возвращает его периметр""" - return 4 * a \ No newline at end of file + \ No newline at end of file From 5e01bedbd8701b0801affa857b64b303f8105e38 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 13:25:18 +0300 Subject: [PATCH 15/24] adding comment to circle.py --- circle.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/circle.py b/circle.py index 5ecf2d4ddd..136d06384a 100644 --- a/circle.py +++ b/circle.py @@ -1,11 +1 @@ -import math -import unittest - -def area_circle(r): - '''Принимает число r-радиус окружности, возвращает её площадь''' - return math.pi * r * r - - -def perimeter_circle(r): - '''Принимает число r-радиус окружности, возвращает её длину''' - return 2 * math.pi * r \ No newline at end of file + \ No newline at end of file From a5c1d98d988193487c73f1e290d2b8c5f022b950 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Fri, 4 Oct 2024 14:37:11 +0300 Subject: [PATCH 16/24] Add more to explain --- docs/README.md | 124 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 63f8727939..b48d75b282 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,5 +1,10 @@ +# Общее описание решений +- Сделал git clone своего репозитория +- открыл папку geometric_lib через терминал +- Описал решение фаилов rectangle.py и triangle.py на Pycharm +- Сделал git commit каждому файлу # Math formulas -## Area +# Area - Circle: S = πR² - Rectangle: S = ab - Square: S = a² @@ -7,4 +12,119 @@ ## Perimeter - Circle: P = 2πR - Rectangle: P = 2a + 2b -- Square: P = 4a \ No newline at end of file +- Square: P = 4a +# Описание каждой функции с примерами вызова +## Circle: +``` +import math +import unittest + +def area_circle(r): + '''Принимает число r-радиус окружности, возвращает её площадь''' + return math.pi * r * r + + +def perimeter_circle(r): + '''Принимает число r-радиус окружности, возвращает её длину''' + return 2 * math.pi * r +``` + +Example: + +in : `10` + +out :` 100 62,83` + + + +# Rectangle: +``` +def area_rectangle(a, b): + """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" + return a * b + +def perimeter_rectangle(a, b): + """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" + return 2*(a + b) +``` + +Example : + +in: `3 4` + +out : `12 14` + + +# Square: +``` +def area_square(a): + """Принимает сторону квадрата a, возвращает его площадь""" + return a * a + +def perimeter_square(a): + """Принимает сторону квадрата a, возвращает его периметр""" + return 4 * a + + ``` + +Example: + +in :``` 10``` + +out : ```100 40``` + + + +# Triangle : +``` +def area_triangle(a, h): + """ + Принимает сторону треугольника a и высоту h, опирающуюся на сторону a, + возвращает площадь треугольника + """ + return a * h / 2 + +def perimeter_triangle(a, b, c): + """Принимает стороны треугольника a,b,c, возвращает его периметр""" + return a + b + c +``` + +Example: + +in : `10 5` `3 3 4 ` + +out : `25 10` +``` +def perimeter(a, b, c): + return a + b + c + ``` + +# История изменения проекта с хешами комитов +- **commit 5e01bedbd8701b0801affa857b64b303f8105e38* +``` + Author: Nguyen Van Chinh + Date: Fri Oct 4 13:25:18 2024 +0300 + + adding comment to circle.py +``` +2. **commit 5e97c4b409bd2462994af4cb4195f48091d2fc43* +``` + Author: Nguyen Van Chinh + Date: Fri Oct 4 13:24:19 2024 +0300 + + adding comment to square.py +``` +3. **commit c771d335aa477310db4d053780ad2ec484808148* +``` + Author: Nguyen Van Chinh + Date: Fri Oct 4 13:23:03 2024 +0300 + + adding comment to triangle.py +``` + +4.**commit 35b21816d0bcdd156bd79b185342f6c9315790e2* +``` +Author: Nguyen Van Chinh Date: Fri, 18 Oct 2024 01:43:19 +0300 Subject: [PATCH 17/24] change_1 --- circle.py | 12 +++++++++++- docs/README.md | 29 +++++++---------------------- rectangle.py | 8 +++++++- square.py | 8 +++++++- triangle.py | 11 ++++++++++- 5 files changed, 42 insertions(+), 26 deletions(-) diff --git a/circle.py b/circle.py index 136d06384a..5ecf2d4ddd 100644 --- a/circle.py +++ b/circle.py @@ -1 +1,11 @@ - \ No newline at end of file +import math +import unittest + +def area_circle(r): + '''Принимает число r-радиус окружности, возвращает её площадь''' + return math.pi * r * r + + +def perimeter_circle(r): + '''Принимает число r-радиус окружности, возвращает её длину''' + return 2 * math.pi * r \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index b48d75b282..1247a2f313 100644 --- a/docs/README.md +++ b/docs/README.md @@ -32,10 +32,7 @@ def perimeter_circle(r): Example: in : `10` - -out :` 100 62,83` - - +out :` 100 62,83` # Rectangle: ``` @@ -47,14 +44,11 @@ def perimeter_rectangle(a, b): """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" return 2*(a + b) ``` - Example : in: `3 4` - out : `12 14` - # Square: ``` def area_square(a): @@ -69,11 +63,8 @@ def perimeter_square(a): Example: -in :``` 10``` - -out : ```100 40``` - - +in : `10 ` +out : `100 40` # Triangle : ``` @@ -92,37 +83,31 @@ def perimeter_triangle(a, b, c): Example: in : `10 5` `3 3 4 ` - out : `25 10` -``` -def perimeter(a, b, c): - return a + b + c - ``` # История изменения проекта с хешами комитов -- **commit 5e01bedbd8701b0801affa857b64b303f8105e38* +1. **commit** 5e01bedbd8701b0801affa857b64b303f8105e38* ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:25:18 2024 +0300 adding comment to circle.py ``` -2. **commit 5e97c4b409bd2462994af4cb4195f48091d2fc43* +2. **commit** 5e97c4b409bd2462994af4cb4195f48091d2fc43* ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:24:19 2024 +0300 adding comment to square.py ``` -3. **commit c771d335aa477310db4d053780ad2ec484808148* +3. **commit** c771d335aa477310db4d053780ad2ec484808148* ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:23:03 2024 +0300 adding comment to triangle.py ``` - -4.**commit 35b21816d0bcdd156bd79b185342f6c9315790e2* +4. **commit** 35b21816d0bcdd156bd79b185342f6c9315790e2* ``` Author: Nguyen Van Chinh Date: Fri, 18 Oct 2024 03:03:49 +0300 Subject: [PATCH 18/24] change --- docs/README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/README.md b/docs/README.md index 1247a2f313..4b047c51e6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,7 +4,7 @@ - Описал решение фаилов rectangle.py и triangle.py на Pycharm - Сделал git commit каждому файлу # Math formulas -# Area +## Area - Circle: S = πR² - Rectangle: S = ab - Square: S = a² @@ -29,12 +29,12 @@ def perimeter_circle(r): return 2 * math.pi * r ``` -Example: +_Example:_ in : `10` out :` 100 62,83` -# Rectangle: +## Rectangle: ``` def area_rectangle(a, b): """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" @@ -44,12 +44,12 @@ def perimeter_rectangle(a, b): """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" return 2*(a + b) ``` -Example : +_Example:_ in: `3 4` out : `12 14` -# Square: +## Square: ``` def area_square(a): """Принимает сторону квадрата a, возвращает его площадь""" @@ -61,12 +61,12 @@ def perimeter_square(a): ``` -Example: +_Example:_ in : `10 ` out : `100 40` -# Triangle : +## Triangle : ``` def area_triangle(a, h): """ @@ -80,34 +80,34 @@ def perimeter_triangle(a, b, c): return a + b + c ``` -Example: +_Example:_ in : `10 5` `3 3 4 ` out : `25 10` # История изменения проекта с хешами комитов -1. **commit** 5e01bedbd8701b0801affa857b64b303f8105e38* +1. **commit** 5e01bedbd8701b0801affa857b64b303f8105e38 ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:25:18 2024 +0300 adding comment to circle.py ``` -2. **commit** 5e97c4b409bd2462994af4cb4195f48091d2fc43* +2. **commit** 5e97c4b409bd2462994af4cb4195f48091d2fc43 ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:24:19 2024 +0300 adding comment to square.py ``` -3. **commit** c771d335aa477310db4d053780ad2ec484808148* +3. **commit** c771d335aa477310db4d053780ad2ec484808148 ``` Author: Nguyen Van Chinh Date: Fri Oct 4 13:23:03 2024 +0300 adding comment to triangle.py ``` -4. **commit** 35b21816d0bcdd156bd79b185342f6c9315790e2* +4. **commit** 35b21816d0bcdd156bd79b185342f6c9315790e2 ``` Author: Nguyen Van Chinh Date: Wed, 13 Nov 2024 01:44:22 +0300 Subject: [PATCH 19/24] No4 --- __pycache__/circle.cpython-311.pyc | Bin 0 -> 843 bytes __pycache__/rectangle.cpython-311.pyc | Bin 0 -> 865 bytes __pycache__/square.cpython-311.pyc | Bin 0 -> 700 bytes __pycache__/square.cpython-312.pyc | Bin 0 -> 668 bytes __pycache__/test_circle.cpython-311.pyc | Bin 0 -> 2193 bytes __pycache__/test_rectangle.cpython-311.pyc | Bin 0 -> 2278 bytes __pycache__/test_square.cpython-311.pyc | Bin 0 -> 2181 bytes __pycache__/test_triangle.cpython-311.pyc | Bin 0 -> 2270 bytes __pycache__/triangle.cpython-311.pyc | Bin 0 -> 873 bytes circle.py | 17 ++++++++--- docs/README.md | 15 +++++----- rectangle.py | 16 +++++++++-- square.py | 14 ++++++++-- test_circle.py | 29 +++++++++++++++++++ test_rectangle.py | 29 +++++++++++++++++++ test_square.py | 31 +++++++++++++++++++++ test_triangle.py | 30 ++++++++++++++++++++ triangle.py | 16 +++++++++-- 18 files changed, 178 insertions(+), 19 deletions(-) create mode 100644 __pycache__/circle.cpython-311.pyc create mode 100644 __pycache__/rectangle.cpython-311.pyc create mode 100644 __pycache__/square.cpython-311.pyc create mode 100644 __pycache__/square.cpython-312.pyc create mode 100644 __pycache__/test_circle.cpython-311.pyc create mode 100644 __pycache__/test_rectangle.cpython-311.pyc create mode 100644 __pycache__/test_square.cpython-311.pyc create mode 100644 __pycache__/test_triangle.cpython-311.pyc create mode 100644 __pycache__/triangle.cpython-311.pyc create mode 100644 test_circle.py create mode 100644 test_rectangle.py create mode 100644 test_square.py create mode 100644 test_triangle.py diff --git a/__pycache__/circle.cpython-311.pyc b/__pycache__/circle.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c6c68bacb9148214c9c68950c94147ae6098be0c GIT binary patch literal 843 zcmcJN&r2IY6vy9eQnbcMgwjL2%%KznThxM;wCJT?h2l*D&6-`}mQ4+lU8>?CF@+LH zX?s$CLz7mwDfL@9pkq_ER!B0u=Ah z?iGGBfIlj^45Pp3rD?GT7Ff)MRj`aVu*$3$sbR4dn2evR!sR^mN1=LSbocI)?12|; z0KAOqc3}G!K&Ui_`A1YX!YS}jRHdMo_*w39`4-!@Ql zZ?Yn5_=OrevMP76J;m{a{I7VTN@cx2geHCDc&esouO%D$d0Lh>&0@*5GdfXk;k@D* zo|~D@Mb3ur@l1}-O!vK}5yXq8w;mWJr^x~)%If3zMfzDLTX5F>wXAEd%@!Oln|DOs zwI7zYf`ln-^F^2oMPIQh-yx~M-xQ3d8jn9buRqxzuPyE)_@}1Xs9WfIL+MSFE`nf<87OJHQ+SgMrhMyKUEZ?;kM2fc5p_S)Ix-rJsFGy7M T)is9ML>D5tJEYR9qUZhtP(cV| literal 0 HcmV?d00001 diff --git a/__pycache__/rectangle.cpython-311.pyc b/__pycache__/rectangle.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ced8254d5916b9bd47914d7965023ce9427fea64 GIT binary patch literal 865 zcmd6l&uddb5XWap}p7bWY^d5O`Yfs(+x%K3CwnTLY|7gL*iXN=C-T3 zciiBn+tA$MhUNqJ7W$#)kN6y6A0TB*yLGq0$1aA@aWx%kZfV5pC_)N4bhyP$&0k&Y zw)qQ=YWxXDZMW%6zKHc%Sxzt_r&Rt@337?H5n?#jRUQNTq)Vo9z>Gv<{_u?mg2=oVEVe9!0rlCAxhy%(&^aH{F zNVy66EzAf*ckw@Po&k2B{!{2$dAuEi8NjyZ;difAj4hT;)!5&-$}f09GKJNUYxvn+a literal 0 HcmV?d00001 diff --git a/__pycache__/square.cpython-311.pyc b/__pycache__/square.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7f6ced76c592e59a662b95e6e27415e1a2f4e3e7 GIT binary patch literal 700 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 Z5$~&sECn;S!wcqS)$cg*V~1JalwTyK<@W#p literal 0 HcmV?d00001 diff --git a/__pycache__/test_square.cpython-311.pyc b/__pycache__/test_square.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a79eff9d8915c617d7b124ee5d34705c0b65dc8e GIT binary patch literal 2181 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 literal 0 HcmV?d00001 diff --git a/circle.py b/circle.py index 5ecf2d4ddd..d343ba6f83 100644 --- a/circle.py +++ b/circle.py @@ -1,11 +1,20 @@ import math -import unittest - def area_circle(r): - '''Принимает число r-радиус окружности, возвращает её площадь''' + ''' + Принимает число r-радиус окружности, возвращает её площадь + + Example: + in : `10` + out :` 100` + ''' return math.pi * r * r def perimeter_circle(r): - '''Принимает число r-радиус окружности, возвращает её длину''' + '''Принимает число r-радиус окружности, возвращает её длину + Example: + + in : `10` + out :` 62,83` + ''' return 2 * math.pi * r \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 4b047c51e6..d2775e1287 100644 --- a/docs/README.md +++ b/docs/README.md @@ -17,7 +17,6 @@ ## Circle: ``` import math -import unittest def area_circle(r): '''Принимает число r-радиус окружности, возвращает её площадь''' @@ -37,11 +36,11 @@ out :` 100 62,83` ## Rectangle: ``` def area_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" + '''Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь''' return a * b def perimeter_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" + '''Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр''' return 2*(a + b) ``` _Example:_ @@ -52,11 +51,11 @@ out : `12 14` ## Square: ``` def area_square(a): - """Принимает сторону квадрата a, возвращает его площадь""" + '''Принимает сторону квадрата a, возвращает его площадь''' return a * a def perimeter_square(a): - """Принимает сторону квадрата a, возвращает его периметр""" + '''Принимает сторону квадрата a, возвращает его периметр''' return 4 * a ``` @@ -69,14 +68,14 @@ out : `100 40` ## Triangle : ``` def area_triangle(a, h): - """ + ''' Принимает сторону треугольника a и высоту h, опирающуюся на сторону a, возвращает площадь треугольника - """ + ''' return a * h / 2 def perimeter_triangle(a, b, c): - """Принимает стороны треугольника a,b,c, возвращает его периметр""" + '''Принимает стороны треугольника a,b,c, возвращает его периметр''' return a + b + c ``` diff --git a/rectangle.py b/rectangle.py index 0980d6e7b9..ac369e7d37 100644 --- a/rectangle.py +++ b/rectangle.py @@ -1,7 +1,19 @@ def area_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь""" + '''Получает на вход боковую сторону a и основание прямоугольника b, возвращает его площадь + Example: + + in: `3 4` + out : ` 12` + ''' + return a * b def perimeter_rectangle(a, b): - """Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр""" + '''Получает на вход боковую сторону a и основание прямоугольника b, возвращает его периметр + Example: + + in: `3 4` + out : `14` + + ''' return 2*(a + b) \ No newline at end of file diff --git a/square.py b/square.py index cef9b29536..600a15006e 100644 --- a/square.py +++ b/square.py @@ -1,7 +1,17 @@ def area_square(a): - """Принимает сторону квадрата a, возвращает его площадь""" + '''Принимает сторону квадрата a, возвращает его площадь + Example: + + in : `10 ` + out : `100 ` + ''' return a * a def perimeter_square(a): - """Принимает сторону квадрата a, возвращает его периметр""" + '''Принимает сторону квадрата a, возвращает его периметр + Example: + + in : `10 ` + out : ` 40` + ''' return 4 * a diff --git a/test_circle.py b/test_circle.py new file mode 100644 index 0000000000..b4098bff2c --- /dev/null +++ b/test_circle.py @@ -0,0 +1,29 @@ +import unittest +from circle import area_circle +from circle import perimeter_circle + +class CircleTestCase(unittest.TestCase): + def test_zero_mul(self): + result = area_circle(0) + self.assertEqual(result, 0) + + def test_one_mul(self): + result = area_circle(10) + self.assertEqual(result, 314.1592653589793) + + def test_two_mul(self): + result = area_circle(67.636) + self.assertEqual(result, 14371.619275936122) + + def test_three_mul(self): + result = perimeter_circle(0) + self.assertEqual(result, 0) + + + def test_four_mul(self): + result = perimeter_circle(10) + self.assertEqual(result, 62.83185307179586) + + def test_five_mul(self): + result = perimeter_circle(67.636) + self.assertEqual(result, 424.96952143639845) \ No newline at end of file diff --git a/test_rectangle.py b/test_rectangle.py new file mode 100644 index 0000000000..4c2f5c567b --- /dev/null +++ b/test_rectangle.py @@ -0,0 +1,29 @@ +import unittest +from rectangle import area_rectangle +from rectangle import perimeter_rectangle + +class RectangleTestCase(unittest.TestCase): + + def test_zero_mul(self): + result = area_rectangle(0,13) + self.assertEqual(result, 0) + + def test_one_mul(self): + result = area_rectangle(10,13) + self.assertEqual(result, 130) + + def test_two_mul(self): + result = area_rectangle(67.5,3.5) + self.assertEqual(result, 236.25) + + def test_three_mul(self): + result = perimeter_rectangle(0,0) + self.assertEqual(result, 0) + + def test_four_mul(self): + result = perimeter_rectangle(10,54) + self.assertEqual(result, 128) + + def test_five_mul(self): + result = perimeter_rectangle(67.636,42.364) + self.assertEqual(result,220) \ No newline at end of file diff --git a/test_square.py b/test_square.py new file mode 100644 index 0000000000..db08cc85bc --- /dev/null +++ b/test_square.py @@ -0,0 +1,31 @@ +import unittest +from square import area_square +from square import perimeter_square + +class SquareTestCase(unittest.TestCase): + + def test_zero_mul(self): + result = area_square(0) + self.assertEqual(result, 0) + + def test_one_mul(self): + result = area_square(10) + self.assertEqual(result, 100) + + + def test_two_mul(self): + result = area_square(7.5) + self.assertEqual(result, 56.25) + + def test_three_mul(self): + result = perimeter_square(0) + self.assertEqual(result, 0) + + + def test_four_mul(self): + result = perimeter_square(10) + self.assertEqual(result, 55) + + def test_five_mul(self): + result = perimeter_square(17.25) + self.assertEqual(result, 56) \ No newline at end of file diff --git a/test_triangle.py b/test_triangle.py new file mode 100644 index 0000000000..c9c049ddf0 --- /dev/null +++ b/test_triangle.py @@ -0,0 +1,30 @@ +import unittest +from triangle import area_triangle +from triangle import perimeter_triangle + +class TriangleTestCase(unittest.TestCase): + def test_0_mul(self): + result = area_triangle(7, 8) + self.assertEqual(result, 30) + + def test_1_mul(self): + result = area_triangle(10, 5) + self.assertEqual(result, 25) + + def test_2_mul(self): + result = area_triangle(7.5, 3.5) + self.assertEqual(result, 13.125) + + def test_3_mul(self): + result = perimeter_triangle(0, 0, 0) + self.assertEqual(result, 0) + + + def test_4_mul(self): + result = perimeter_triangle(10, 4, 8) + self.assertEqual(result, 22) + + + def test_five_mul(self): + result = perimeter_triangle(34.23, 42.34, 23.43) + self.assertEqual(result, 100) diff --git a/triangle.py b/triangle.py index cda39793ef..9a868eadb8 100644 --- a/triangle.py +++ b/triangle.py @@ -1,10 +1,20 @@ def area_triangle(a, h): - """ + ''' Принимает сторону треугольника a и высоту h, опирающуюся на сторону a, возвращает площадь треугольника - """ + Example: + + in : `10 5 ` + out : `25 ` + ''' return a * h / 2 def perimeter_triangle(a, b, c): - """Принимает стороны треугольника a,b,c, возвращает его периметр""" + '''Принимает стороны треугольника a,b,c, возвращает его периметр + Example: + + in : + `3 3 4 ` + out : ` 10` + ''' return a + b + c \ No newline at end of file From ad80e16300279f3f53f3992584ef0613f81f773f Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Sun, 17 Nov 2024 06:22:18 +0300 Subject: [PATCH 20/24] rectangle.py --- __pycache__/circle.cpython-311.pyc | Bin 843 -> 1171 bytes __pycache__/circle.cpython-312.pyc | Bin 0 -> 825 bytes __pycache__/rectangle.cpython-311.pyc | Bin 865 -> 1450 bytes __pycache__/rectangle.cpython-312.pyc | Bin 0 -> 833 bytes __pycache__/square.cpython-311.pyc | Bin 700 -> 1038 bytes __pycache__/test_circle.cpython-311.pyc | Bin 2193 -> 2270 bytes __pycache__/test_rectangle.cpython-311.pyc | Bin 2278 -> 2344 bytes __pycache__/test_square.cpython-311.pyc | Bin 2181 -> 2242 bytes __pycache__/test_triangle.cpython-311.pyc | Bin 2270 -> 2355 bytes __pycache__/triangle.cpython-311.pyc | Bin 873 -> 1655 bytes __pycache__/triangle.cpython-312.pyc | Bin 0 -> 841 bytes circle.py | 6 ++++ rectangle.py | 7 +++++ square.py | 5 ++++ test_circle.py | 33 +++++++++++---------- test_rectangle.py | 32 ++++++++++++-------- test_square.py | 33 +++++++++++---------- test_triangle.py | 24 ++++++++------- triangle.py | 4 +++ 19 files changed, 90 insertions(+), 54 deletions(-) create mode 100644 __pycache__/circle.cpython-312.pyc create mode 100644 __pycache__/rectangle.cpython-312.pyc create mode 100644 __pycache__/triangle.cpython-312.pyc diff --git a/__pycache__/circle.cpython-311.pyc b/__pycache__/circle.cpython-311.pyc index c6c68bacb9148214c9c68950c94147ae6098be0c..5611b3e0a549f507ef449d0c866f63ee8ffcb0e1 100644 GIT binary patch literal 1171 zcmcgs%WD%s82@&Y6wRilDk{Vtrbvs0Ds6>UqG%6_coC$x5-{8Bwq2VSlUW}nholvx z5TTx0gyKyTMF^p4@lpSU8SoGmJoQxY5C~p+@|(#6i(WkFEc@H}9`pNV=lkux?ClK# zj{1$s`5_;`t~5GBZ%>*LoUDTdmX?GWu=GbTqgg&g-O{FE*uN(eZzZ&LzI+7mMm}gR zA*=)YC6)))Va6EqBechy{sJSfyHOg-W6ebs&Gq11UsTytw|vvUdOGU>?si%7u!OZ+ zDEH>R!K@&`!Jmr)-{zn3{=}>Ntym`FG2a$N{*mtxdJdyizJ-nzQ6zkae-H(+!r$S7 z9Z?j^e0zlO8v5V!noJd|Z4zX9O86JaqI_GTr0OZS{=iISlXg@Yau-gTL`i&XG~V@O zTt=dCGB(=wQThJg<>7&K>g-|I58q5DGL+g0hO4tKs|38DlXKEJW~LLi=X27`3(O@m zCiDC$lP!39)~RToMsxDi$$sQoG&b)nxU;dOIXgb@uvo&OiKKl#`_MB?YMXajHVtFC zES{S}D8P?n5IVVLZl2k6H~NJ!^wk(@fEE}i50uSUgXO{MSoK~lT8-AjgonvDBV3wX zyS;j8O-^yVN<$zifD+g7etb-D0w|`=Mv zD3k!GR5X>J(VlDxm13tMgjQ4O5uAE`S(`d3o7uF}!sF=flUY*;*uuWQX<^+6Jz=H$ z-4;^GH0-1D7oo&KC4B{yU+rN3(B)Lda+CHIdICdIZ@CGChELP9Iv53YHFQHe-GDCi K2c`KtDBhohuTVJv delta 337 zcmbQtd76!HIWI340}%8dQb~WnIFZlWlnKaV2I9|ZKw>&W36O+=EJhfshM|g;fdN7W zGiWkSe6)#aCDY{djP@cR<3MHH48czO3oKGa+(21P<|3fO8Hzxz1Z!Ez02T+E`isLRH$SB`C)KV< a04P7%pG8uegHiee1Dp_J2XQe8uo(b<@IVp( diff --git a/__pycache__/circle.cpython-312.pyc b/__pycache__/circle.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7f65a6a700b68ff071cc6e61f7fa7382bf021243 GIT binary patch literal 825 zcmcJNO-LI-6vy9eB3ff4?LmrO=Fm&PiXWgQE$yjSLA*(zS+h&rve7Wv#aenuOrb0Y zX-^g}o^udH(l+!X1+QM-T-S@xlQ%IvdGgI9S;)nk59ZIj|C{$_`OTgslcPXUKYdcT zU;zJA(hsAz={%;*K3HHe7uLWsKEfKaVx-0nOUEzOvE@8HD<2erFa-uAR||`U+>0XLxRI zHWxWtzQ;2;J~!L*8b%l|n%+iel$-_&nJ6n5{ASY1WDCxQzn*o?_4$J1W%G{6yY@_J zCrp^aHs5q}q254|DNm48;C~9nQuU=^>GMkP{OiNu6~-q!RDru7TkLMk1CR~>fX3Y~ z-zM>;$CI@|tU4QH+T*!6KmBZ>OZigK5OF2LBwe230d2!n$reu0_H5CoH%@j^o$AuN z8i%puo>$)vwj+8XLG^S@(2oY1wopwC(7v8~GxDOiW%;iCQlzM)9F|7=LeeH)?lv)9lZ|;7KG2C1^$@(WwYQ0uv2X(Ak}Fo7|mU-_Bsg9#$=C zLCTw5q+1~oZ06RYt(^kt^gT0>xpopdEJzpW(D$a@#i&Caf_l99=KFr%pZCqY-+NDM zYWxJp=H;`|uO31^Nux4oS=p{fWsYd%4jCXCMM*WKm$Y~yN+lHEK76nO+0LPuBUU9F ztu(QAMOt2j%41Y{f}UqpFYovvkN$Svku-KT=2lJBr)gCWBCd?NE2j1!Ue>vyd3v$0 zG`)>|jhV~>TVF*?zLILs&-inNP2yf6e4KLBPB4%9IGS&{C#PW!}#+n((iEL%zybQ%$ zSiwArE{PdG!*S`R8c)XbPQPmzW+xjtE%A;K7f9F^Lx{Dtf48^fKlv;-hG>UR>?1p& zE;EwgT#s1HFq5{m;Bov$$}m%wYDRR&W0;oX8;vDYYe8|S>din^J`%$9^G;ai& zON9EGp5G|c6?@+uFLaC6u8r0%7hLOso~!Ts*7~6T8Vn4s_YVTj;Sq=!>%#`%jGHh% zu^yj*_{3(2L5OVzg7?R>XENQ}xE%R4HD96U|DdMkb;*hSmI>;!Kcew35;Tv*Eg-$| zyok&nP_zvh>xOg5PA<i<5`)Y+!2o;?TN1};~=(xSL@=dzUr;$m*YJA2Q^6Pg{%LL>x1Mz1bATgbxhM|VBij{#Om_d`V^z!7j z%+n_?X0&Ho$uL=#$zFs5sD=@Ui+O=W1H%Ua1|HtY=a?iEK_-Ar5dt!%Go&zr%>lBZ zW-(1(&3sGZCCIWOkh&rkAW;nBDkv1OPhP_!Sr4+G8zc%c0%~?g;snLc)K1F_EFwjm zKw&>krXr9Via?4X27!c&*nz|^4x8Nkl+v73yCRV5z|PbKGCnXfGBSQ(;$Rf~zyK#i QI2c7iTm-=lVS=pz081!0Z~y=R diff --git a/__pycache__/rectangle.cpython-312.pyc b/__pycache__/rectangle.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a8431b744daa62b92684c71efe053e876d658290 GIT binary patch literal 833 zcmd6lJxF6g5XX04JdDx!Z7Hl^6F5XYEev9J-Eobb1oXu$F_36n^WYSVr%^N@=XI7> z+r^JyFvf#xZDtXhv{rU<>8$R*Ya&|OIk59){yQ^|_nUVU4u=@*@b7SP)M4!2Bu(Ru zpx%w(h$Yw#n_~$M&)1zuU=j5%X5s)&y#wxuZL&?i@rkin7UAA4B>GL)RMC08M@1^> zZ9!Ek3Od!h(9Z>(;Bkp_ijto~Z|QBi);@%)&I?yiSs>p+6G||lN@Xeu`lEe)NLRSZ z(;2QR`oLaYVs`v9#zVWnOrMIn(0p;pl%kg^=riiMJ_rfe*B@>so0id#%~H!zvGB#{ z6AM;Y@p1x^7#n}ikJ+(P<8F<|*UZ-o@idr-#*(QeFCI&~@$qCT7gKUE=PoDHawNN6 z>vWZL=U*fhM3-T_7KZcLV>jyv@2?gn{cm*$>+UED^)5Zb5gzHYJS0XQ)yT=xw^lG3bHUo zE&Zwu^7n{i`72ZWJlx23>Qit!vy$-Aaz>fW*cEjlcnomP|2aY4Q|}M*0XyeE2LM4B literal 0 HcmV?d00001 diff --git a/__pycache__/square.cpython-311.pyc b/__pycache__/square.cpython-311.pyc index 7f6ced76c592e59a662b95e6e27415e1a2f4e3e7..3dd99e5996f4dbf16cbb6a334c3a66b87e40e006 100644 GIT binary patch literal 1038 zcmcgr&ubGw6n?v#6uU{9RzXEPOpz7~Dy=BuBAyfx#7l1yFx%`lE=@M+?5wEd5UU3Z z9t6R9DW23sFH3Atw2lA5EO-ce^;GZ>2wrmPn@KkaUPREh%-i?A_iNbi?b}R72bAu$ z3&qzez<1%qqU;;}gJ^7k1&`qtSPE*zQWs%PE5sQhF^NaR)6b*Y0QO6)1`K=0!V<9s zu&lnp$oo;0rfWE1MJ9M-XsatSo2r(!2sL~j;2fNt@SkH6e-+mGC%%Jcn+Lodu95Iz zxW+pOclb{Di15$6g^?`;0t^JiJVg-c@Q=JDvGx5r-sT^8hw!ib3ziFXD}1UGl&km5 zarK5dOu3x+q^yW zX$I3piFXlI9ez$i`tUPz^TekA@_3k<{g#^Tfs&kVOgGGTGmV*GA-LNz0;8KHJWIN% z^pn-~^Yt5jEQbG0rGn%a0)G6D{rZGEH2n&W{b|(Ic9Xf$6ZqBKaY$|#-L1J?3;J~GF#qvw` fWqJrhav4se(bE(~>8ZLh)q{~bIxgJbm29^M^6N6z delta 308 zcmeC<*u%=VoR^o20SNjJsiZGpoXBS@%>?8z1Mz1bATgbx1_-NI85n{YG#MxEn!&V^ zVRA2{sV6&7k`bhe7f3WPeBfi?;q55wG;Q$t3>08U2Fbwynu#fla1)tIr%l`wG5Il* zWBp4OpzST#}I+a#4Og)N&2BvB;D#E{C6#SUVFz%n3S z4Q7D|Murr|U@+EXpIGscQFC$@V~9FeNosLPyg__!X-<`-b7oO;PHG5H#5u7zRSzM> zKKV7{CR+}mDMcVB6oaf&P$=RBQnw%`7~(boEX6(f9+NR6|0LFefb=AR2+J)m0vytF zgz{a^3!ZT(!e_D(Zj-@M{FARSn}SXDf5{4T&`W+Gv688X1xOWff(RT=HpXo*SW0;E zX%=N6p^F?US2$EIz)%s;4~1@mKy%aMEJ8J_viu#2B=Fc`g4-68$$MF?z%I|s{PzF< z|0;gZyyX0%qSWLPh0MHy(h|G|o8mSYEF}$eRIv__XkfT2sJKA+qM+IpLAA*rnG_iL zCx2kmR^tP?S_njlfCxzt0n$_?3nW%D6oJCAhaYCa}zW3;^Q?rCSPRN(USuSvVeq&6hSsYtOK%saoFVMr&AQzbL`B8vzojLSAzm}!$LC(x84ZXi+21SAv`iui!kEgrDO{Jd1KK539X z4k(XnG83~gqrhYZ)&h&?Ndgg;TV4b>q~{3byPOw1<4}apypnQ=J0Rvkd3=+>+`C7U|?c}5?qt}*kwh5d{dC1DMT?FP=_YlOjv z2D3l}BSQ*fFc@pHZ>)%9Sh|ev}sgjxekWrk`VDcZvD^PJmByq#ZKbamt z#f^}}jV3d(T!e}nBZ(VNVucxFf+TD*`9JGA>C9jM|Nno<3UpBwzh_=@eo;|sa*0A_ zUO{QeAu&Vj zf}+ty4wEY!CKq66vIF}eZPO17OswcckpR%JA~qm#iz7ZhH!(9WK3>z;^NlHr5u(aK!YS0(TN!xS0pq)f+W5mWK9@Ycsi;sF-u-xmb}3t Z*x=FP+vwlo-vEXmm>F24fD&ML0083)h=>3H delta 449 zcmZ1>^h}U%IWI340}z}(ZJch)Jdsa=(PyH%H(Ls0FoP!B#$}O=0=y-u#U=4osYUtm zxurQ(@{?G_SwOtWDoj`SdBBqSd8uGIIiMUfkTY49`2kd_q#U9RECu9DR${p*$OqO{ zl2Mcj(Wd~^#|q|7mSDXCwJ|NfvDKrCd#CHUI=s9C zbbpZqh~Nei#Y{j#L7|8bNZo=sJ}t8hViCykb}*haNU<)EXkfT2sInkzh1*3z<12#3 z9c(u^c&>9uT;htG6HdN=H%HNmKH#RBpA_&85~z6G(UnQzF?6B8w&tl CG=Mq) diff --git a/__pycache__/test_square.cpython-311.pyc b/__pycache__/test_square.cpython-311.pyc index a79eff9d8915c617d7b124ee5d34705c0b65dc8e..f30cda54c8d270285687fcd36a7340bdcc70882e 100644 GIT binary patch delta 508 zcmZn_JS51soR^o20SI(sEz@_fOyrYbteU9qZIa5C!j{bhk|+{nVn}7kVh6E7U>Ojv z2D3l}BSQ*fFc@pHZ>(@*RN^X0EiQ>Sh|ev}sgevXEKMv*4FQTcCl;sbL8K->V>}5} zW{6vv;pD4K7u6xA8R1q2mg1j$k@+Z8tub!3U@76rM_Gk*eb}koR^o20SLC8F-~V=p2#P`=rd8>n=OSgm_d_m<1#l!0p60-;*$8P)S~?O z+|ryXnaK;;L|8!F$$U&F`FX&y`FW{eNokNIGmtm=C(}i!TuC`ZBUp|D$`hFUk@=_~ zA6RoqMo}t6yDUgM7o0CL`7X;bsQqdAr9}w)IbmGM$){LP!IWf{L5u-Akuwd-m7Tns z?I$76||i006gSXjA|I diff --git a/__pycache__/test_triangle.cpython-311.pyc b/__pycache__/test_triangle.cpython-311.pyc index 3d58518f0ff1467e3ae0c5aa7c6208a46123c8c7..221e6f87e2c603d439a2d941b2c88e40c81284b3 100644 GIT binary patch delta 424 zcmca7xLJsAIWI340}yD&TBdWbPUMqdteU9qZIa5C!j{bhk|+{nVn}7kVh6E7U>Ojv z2D3l}BSQ*fFc@pHZ>(TvWR#iQz*xn|KKVD}cSi2XpP6k5& zRVRzGI!umXnJ6U;)L*O*BpMj*3MwyfTu`_|@S>ph6+!LE?5r~dizI~I!FV9gOFgk`8F#LqpLKC%?l)onSg|X zLXiNFy2V?PT3iyJmRXh>pIe$!B^OeZnV6TJlNtgPc1|o#)kBe&nXJa1$0i9fNoMja zc5@#lCRWuC3~+)2&H{@8xtbtZC;{ZEfVfbC3so`KWLXYHCQY`L4pX{sg=7 w7l%!5eoARhs$G#bP>d0Xi!&!L<1n|9WK{dWfJscKxFW9c5hU>ii!9h+08sd8ApigX diff --git a/__pycache__/triangle.cpython-311.pyc b/__pycache__/triangle.cpython-311.pyc index 1a1a5f710bb6383a2195b1f8b213042b917dacf8..91d043acc7e25ff1da5792178edeefa1f6473836 100644 GIT binary patch literal 1655 zcmbVLOK1~87@nQ9K9bgId?F$vKCn=W^?_JK1Qjh*F_unh7nGT*ZUnAy`D{$#2#qw%X!j*!|!CzcV}EcdxwMORy%7 z>}kL4A>@N{3QNlyQ+^mXNSItC%_OWrYGK+yDm?}*ltP!{#RM|-4B`f{3*GQi#GX-U zmmrj1XX#yJ9u~8F*Q`G6ulv@du(J+#YSN$5igp>|w8Q;kaslFbo71qT0sBg6z1VlS zq}N9XPE_iA!w4_K5_e?3NQ*JNuf&KLm4i$U$U*TM;n!kJ4ly|hb5stACkVWhSKQhc zVua~Tq?vduFUtXx527?u#ZdD`q|q@VugYOL1UVqDF*J?*I#{pzv4h9xd5$@%XE?tH z40(y6%6%%Y%)1A7z~S?HED<$py{>1)SuG3IY-hV!$PIKlwud{zgja7} zOr|U9;zlRureQNHo^b3>>Y5&SvR*4`#gn!kH_WWZird-Jv(Zl7uB2H_&uWpRDr0PV z-J#lGyA^TTf>FI~N4sSQZEorD_NZB%=*gDr+|*kO5xxXH3Ngt9L_hiJCuOUy>$f)E za&E4ZzAfXvEjgllU%@$qFVa*rc!QQrGbA>ovoBMahaOe3KaN$(4mw1oHxH>c7Dp z{7*0+nAJ!Bngp9>kYN1`60AwlA|d=U2vPQv5FiJggBSK z)2rI53@~9%T#qUmF~EBicvqYQ<7EGQICkTqoopxDH5<*WX8R9xb9J3u5udBeu!DiU47b}|V^;OXfV7y2?ieWIr?N60~Xh(aBqN9h;k9aUal)zf3jJ3*UN zt{w_rUNzGe<(cs#6 delta 325 zcmey)^OB8kIWI340}z}(ZJe&dG?C9%kqO9S2I9{`Kw>&W4MPoM6)OWn3S$*F14A%_ zCevgA#=mSJRVx`L`!LyxZ~&Q%KwJ#c(7^CPh=GT9@^26NuWuLlXY3v z)w2LOn#@H&D;RDuCf#C8E(Y1IprBC14iXY7NG;0DO)W_+iZ3b3Ow3EqNiE_9O7H+N z%tisAjU9!ZrV|W1EibT$6mbIO{4|-0KrRC-E&^Es76u#oi^C>2KczG$)vk!o4k!b5 dy)KaPftit!@dFblqv!_)I3dOX;$jkD^8f@tKKlRw diff --git a/__pycache__/triangle.cpython-312.pyc b/__pycache__/triangle.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0cb8cd2d195d559c252d58e184a0c736abf2a77e GIT binary patch literal 841 zcmah{J#Q015Zyfo;g}pm7NMe;*3t>ZF)3mpI$9b!WC^eBlYNq%n6*zLmJ5GSU?l>& zl(f)U0Sk+e@B`fJw%1b8MYupp#oJ8|6cme*b~W?nU|rVboofu$og0ijVHqdYeVX zsXE5_s>W)f2c-LYpiTgvsAD}OJ%BsWL-i5Bk>0npU(}ccsVS*Ly{G#qAE3165o*4v zDLTgbwI1mq?!JCQXd3@JSa|0f9HQql=9r$*#SR#9grO$*b$Q9BT&tgO-(PIQ@8G?K4G|g7rSIcuw-VfznN11`WUM%fFPlNUY$*l&xN-OfDn$IOAAqr75-_v9KL_mVD6I fsf2a^p}dK#W&akO(*)=Ir?br0=68~O%{Kf7Ct@>Y literal 0 HcmV?d00001 diff --git a/circle.py b/circle.py index d343ba6f83..0f4db943a8 100644 --- a/circle.py +++ b/circle.py @@ -7,6 +7,9 @@ def area_circle(r): in : `10` out :` 100` ''' + # Проверка на корректность ввода + if not isinstance(r, (int, float)) or r < 0 or r > 10**10: + return "Incorrect input" return math.pi * r * r @@ -17,4 +20,7 @@ def perimeter_circle(r): in : `10` out :` 62,83` ''' + # Проверка на корректность ввода + if not isinstance(r, (int, float)) or r < 0 or r > 10**10: + return "Incorrect input" return 2 * math.pi * r \ No newline at end of file diff --git a/rectangle.py b/rectangle.py index ac369e7d37..f64830bb47 100644 --- a/rectangle.py +++ b/rectangle.py @@ -5,6 +5,10 @@ def area_rectangle(a, b): in: `3 4` out : ` 12` ''' + # Проверка на корректность ввода + if not isinstance(a, (int, float)) or not isinstance(b, (int, float)) or a < 0 or b < 0 or a > 10**10 or b > 10**10: + return "Incorrect input" + return a * b return a * b @@ -16,4 +20,7 @@ def perimeter_rectangle(a, b): out : `14` ''' + # Проверка на корректность ввода + if not isinstance(a, (int, float)) or not isinstance(b, (int, float)) or a < 0 or b < 0 or a > 10**10 or b > 10**10: + return "Incorrect input" return 2*(a + b) \ No newline at end of file diff --git a/square.py b/square.py index 600a15006e..c1150f0175 100644 --- a/square.py +++ b/square.py @@ -5,6 +5,9 @@ def area_square(a): in : `10 ` out : `100 ` ''' + # Проверка на корректность ввода + if not isinstance(a, (int, float)) or a < 0 or a > 10**10: + return "Incorrect input" return a * a def perimeter_square(a): @@ -14,4 +17,6 @@ def perimeter_square(a): in : `10 ` out : ` 40` ''' + if not isinstance(a, (int, float)) or a < 0 or a > 10**10: + return "Incorrect input" return 4 * a diff --git a/test_circle.py b/test_circle.py index b4098bff2c..ebcb43a8c3 100644 --- a/test_circle.py +++ b/test_circle.py @@ -3,27 +3,30 @@ from circle import perimeter_circle class CircleTestCase(unittest.TestCase): - def test_zero_mul(self): + # Проверяет, когда радиус равен 0 + def test_0_mul(self): result = area_circle(0) self.assertEqual(result, 0) - - def test_one_mul(self): + # Проверяет, когда радиус равен 10 + def test_1_mul(self): result = area_circle(10) self.assertEqual(result, 314.1592653589793) - - def test_two_mul(self): + # Проверяет, когда радиус равен 67.636 + def test_2_mul(self): result = area_circle(67.636) self.assertEqual(result, 14371.619275936122) - - def test_three_mul(self): - result = perimeter_circle(0) - self.assertEqual(result, 0) - - - def test_four_mul(self): + # Проверяет, когда радиус равен 5 + def test_3_mul(self): + result = perimeter_circle(5) + self.assertEqual(result, 15) + # Проверяет, когда радиус равен 10 + def test_4_mul(self): result = perimeter_circle(10) self.assertEqual(result, 62.83185307179586) + # Проверяет, когда радиус равен -10 + def test_5_mul(self): + result = perimeter_circle(-10) + self.assertEqual(result, "Incorrect input") - def test_five_mul(self): - result = perimeter_circle(67.636) - self.assertEqual(result, 424.96952143639845) \ No newline at end of file +if __name__ == '__main__': + unittest.main() \ No newline at end of file diff --git a/test_rectangle.py b/test_rectangle.py index 4c2f5c567b..9fdd9fef4d 100644 --- a/test_rectangle.py +++ b/test_rectangle.py @@ -3,27 +3,33 @@ from rectangle import perimeter_rectangle class RectangleTestCase(unittest.TestCase): - - def test_zero_mul(self): + # Проверяет, когда стороны равны 0, 10 + def test_0_mul(self): result = area_rectangle(0,13) self.assertEqual(result, 0) - - def test_one_mul(self): + # Проверяет, когда стороны равны 10, 13 + def test_1_mul(self): result = area_rectangle(10,13) self.assertEqual(result, 130) - - def test_two_mul(self): + # Проверяет, когда стороны равны 67,5, 3,5 + def test_2_mul(self): result = area_rectangle(67.5,3.5) self.assertEqual(result, 236.25) - - def test_three_mul(self): + # Проверяет, когда стороны равны 0,0 + def test_3_mul(self): result = perimeter_rectangle(0,0) self.assertEqual(result, 0) - - def test_four_mul(self): + # Проверяет, когда стороны равны 10,54 + def test_4_mul(self): result = perimeter_rectangle(10,54) self.assertEqual(result, 128) + # Проверяет, когда стороны равны -6,5 + def test_5_mul(self): + result = perimeter_rectangle(-6,5) + self.assertEqual(result, "Incorrect input" ) + +if __name__ == '__main__': + unittest.main() + - def test_five_mul(self): - result = perimeter_rectangle(67.636,42.364) - self.assertEqual(result,220) \ No newline at end of file + \ No newline at end of file diff --git a/test_square.py b/test_square.py index db08cc85bc..7145291723 100644 --- a/test_square.py +++ b/test_square.py @@ -3,29 +3,32 @@ from square import perimeter_square class SquareTestCase(unittest.TestCase): - - def test_zero_mul(self): + # Проверяет, когда сторона равна 0 + def test_0_mul(self): result = area_square(0) self.assertEqual(result, 0) - - def test_one_mul(self): + # Проверяет, когда сторона равна 10 + def test_1_mul(self): result = area_square(10) self.assertEqual(result, 100) - - - def test_two_mul(self): + # Проверяет, когда сторона равна 7,5 + def test_2_mul(self): result = area_square(7.5) self.assertEqual(result, 56.25) - - def test_three_mul(self): + # Проверяет, когда сторона равна 56,25 + def test_3_mul(self): result = perimeter_square(0) self.assertEqual(result, 0) - - - def test_four_mul(self): + # Проверяет, когда сторона равна 10 + def test_4_mul(self): result = perimeter_square(10) self.assertEqual(result, 55) - - def test_five_mul(self): + # Проверяет, когда сторона равна 17,25 + def test_5_mul(self): result = perimeter_square(17.25) - self.assertEqual(result, 56) \ No newline at end of file + self.assertEqual(result, 56) + + + +if __name__ == '__main__': + unittest.main() \ No newline at end of file diff --git a/test_triangle.py b/test_triangle.py index c9c049ddf0..90203920a3 100644 --- a/test_triangle.py +++ b/test_triangle.py @@ -3,28 +3,30 @@ from triangle import perimeter_triangle class TriangleTestCase(unittest.TestCase): + # Проверяет, когда стороны равны 7,8, def test_0_mul(self): result = area_triangle(7, 8) - self.assertEqual(result, 30) - + self.assertEqual(result, 28) + # Проверяет, когда стороны равны 10,5 def test_1_mul(self): result = area_triangle(10, 5) self.assertEqual(result, 25) - + # Проверяет, когда стороны равны 7.5 3.5 def test_2_mul(self): result = area_triangle(7.5, 3.5) - self.assertEqual(result, 13.125) - + self.assertEqual(result, 4) + # Проверяет, когда стороны равны 0 0 0 def test_3_mul(self): - result = perimeter_triangle(0, 0, 0) + result = perimeter_triangle(0, 0,0) self.assertEqual(result, 0) - - + # Проверяет, когда стороны равны 10, 4, 8 def test_4_mul(self): result = perimeter_triangle(10, 4, 8) self.assertEqual(result, 22) - - - def test_five_mul(self): + # Проверяет, когда стороны равны 34.23, 42.34, 23.43 + def test_5_mul(self): result = perimeter_triangle(34.23, 42.34, 23.43) self.assertEqual(result, 100) + +if __name__ == '__main__': + unittest.main() \ No newline at end of file diff --git a/triangle.py b/triangle.py index 9a868eadb8..106bdff621 100644 --- a/triangle.py +++ b/triangle.py @@ -7,6 +7,8 @@ def area_triangle(a, h): in : `10 5 ` out : `25 ` ''' + if not isinstance(a, (int, float)) or not isinstance(h, (int, float)) or a < 0 or h < 0 or a > 10**10 or h > 10**10: + return "Incorrect input" return a * h / 2 def perimeter_triangle(a, b, c): @@ -17,4 +19,6 @@ def perimeter_triangle(a, b, c): `3 3 4 ` out : ` 10` ''' + if not isinstance(a, (int, float)) or not isinstance(b, (int, float)) or not isinstance(c, (int, float)) or a < 0 or b < 0 or c < 0 or a > 10**10 or b > 10**10 or c > 10**10: + return "Incorrect input" return a + b + c \ No newline at end of file From 9a638384787438490353bc5f4fb36bb46ef39799 Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Wed, 27 Nov 2024 02:15:24 +0300 Subject: [PATCH 21/24] add tests --- test_circle.py => tests/test_circle.py | 0 test_rectangle.py => tests/test_rectangle.py | 0 test_square.py => tests/test_square.py | 0 test_triangle.py => tests/test_triangle.py | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename test_circle.py => tests/test_circle.py (100%) rename test_rectangle.py => tests/test_rectangle.py (100%) rename test_square.py => tests/test_square.py (100%) rename test_triangle.py => tests/test_triangle.py (100%) diff --git a/test_circle.py b/tests/test_circle.py similarity index 100% rename from test_circle.py rename to tests/test_circle.py diff --git a/test_rectangle.py b/tests/test_rectangle.py similarity index 100% rename from test_rectangle.py rename to tests/test_rectangle.py diff --git a/test_square.py b/tests/test_square.py similarity index 100% rename from test_square.py rename to tests/test_square.py diff --git a/test_triangle.py b/tests/test_triangle.py similarity index 100% rename from test_triangle.py rename to tests/test_triangle.py From e4f516ca307691d14e38822b1bc1c2ea15bc1a87 Mon Sep 17 00:00:00 2001 From: chinhtx04 <150230149+chinhtx04@users.noreply.github.com> Date: Wed, 27 Nov 2024 02:16:32 +0300 Subject: [PATCH 22/24] Create CICD.yml --- .github/workflows/CICD.yml | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/CICD.yml diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml new file mode 100644 index 0000000000..e0410890c6 --- /dev/null +++ b/.github/workflows/CICD.yml @@ -0,0 +1,46 @@ +name: CI - Run Unit Test + +on: + push: + branches: [ "lab5" ] + pull_request: + branches: [ "lab5" ] + workflow_dispatch: + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + + steps: + - name: Check out Repository + uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - name: Display Python version + run: python -c "import sys; print(sys.version)" + + - name: Set up Python + uses: actions/setup-python@v4.7.1 + with: + python-version: 3.8 + + - name: Run My Step + id: myStep + run: echo "::set-output name=myOutput::some value" + + - name: Set Output Variable + run: echo "myOutput=${{ steps.myStep.outputs.myOutput }}" >> $GITHUB_ENV + + - name: Install Dependencies + run: | + echo "There are no dependencies!" + - name: Run Unit Tests + run: | + python -m unittest discover -s ./tests -p "test_*.py" From 84afe73a910631f8c94ea2e3a361ce7b91d0854c Mon Sep 17 00:00:00 2001 From: Nguyen Van Chinh Date: Wed, 27 Nov 2024 03:27:10 +0300 Subject: [PATCH 23/24] .. --- __pycache__/circle.cpython-311.pyc | Bin 1171 -> 1207 bytes __pycache__/rectangle.cpython-311.pyc | Bin 1450 -> 1486 bytes __pycache__/square.cpython-311.pyc | Bin 1038 -> 1074 bytes __pycache__/triangle.cpython-311.pyc | Bin 1655 -> 1691 bytes __pycache__/triangle.cpython-312.pyc | Bin 841 -> 1484 bytes tests/__pycache__/test_circle.cpython-311.pyc | Bin 0 -> 2317 bytes .../test_rectangle.cpython-311.pyc | Bin 0 -> 2386 bytes tests/__pycache__/test_square.cpython-311.pyc | Bin 0 -> 2284 bytes .../__pycache__/test_triangle.cpython-311.pyc | Bin 0 -> 2401 bytes tests/test_circle.py | 2 +- tests/test_square.py | 4 ++-- tests/test_triangle.py | 2 +- 12 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tests/__pycache__/test_circle.cpython-311.pyc create mode 100644 tests/__pycache__/test_rectangle.cpython-311.pyc create mode 100644 tests/__pycache__/test_square.cpython-311.pyc create mode 100644 tests/__pycache__/test_triangle.cpython-311.pyc diff --git a/__pycache__/circle.cpython-311.pyc b/__pycache__/circle.cpython-311.pyc index 5611b3e0a549f507ef449d0c866f63ee8ffcb0e1..0f238684efb8f493284a7d2cdd60c94d65c452e1 100644 GIT binary patch delta 79 zcmbQtxt)`HIWI340}yOVaofm!i_z51#VRH}Gov&qCOtJjH?^cFGdVsdGbtt~G08MO UJ+lNP<5!j(k0QJI8{=Fi00IgeRR910 delta 43 xcmdnaIhm7tIWI340}$MBH{Zy8i&0R@#VRH}Gov&qCMPk;C_S@evlP=@CIA4A45I)5 diff --git a/__pycache__/rectangle.cpython-311.pyc b/__pycache__/rectangle.cpython-311.pyc index 524f6722488ab3cfb8caa9841e0d000bcf8cae7b..5a477e2a2d4f17559e608e99b7d7f3ca8bd94cb0 100644 GIT binary patch delta 79 zcmZ3*eU6)ZIWI340}!lFaofnP#ANE|Vil8~nNgY)lb)KNn_5zonH-;!nG}>Bt@heM?N0HrZ$CSei0OCO!=>Px# delta 43 xcmX@dy^5QAIWI340}$MBH{Zyu#3U%|Vil8~nNgY)larWal%83#If*HU836at3^@P* diff --git a/__pycache__/square.cpython-311.pyc b/__pycache__/square.cpython-311.pyc index 3dd99e5996f4dbf16cbb6a334c3a66b87e40e006..de5a8b7724bbecf7a6a853c5e67e2af24609cdea 100644 GIT binary patch delta 79 zcmeC<*u=rToR^o20SMNmxNYR_V>GpMv5HC0%qUHYNl(qsO)V+POpedVOp3`#Ofrp6 U&nyAS_?0EcqsVSv#hAhb0O^k#bN~PV delta 43 xcmdnQ(Z|8PoR^o20SIomn{VXqV-%Efv5HC0%qUHY$w^EyO3y6We2y`N2>|(c48;Hd diff --git a/__pycache__/triangle.cpython-311.pyc b/__pycache__/triangle.cpython-311.pyc index 91d043acc7e25ff1da5792178edeefa1f6473836..d95a2f90ddbb4d9635268a773960402f4a9e8807 100644 GIT binary patch delta 79 zcmey)GnBOiiAlzZ{C02d!6b0UcZ%= zS`dt??(5!{CWO9oCqIPE#abCGCXoj{Mm@+Qz$`?u%_QM`AXqbeARnzghiMY2`CJr7 zY9UT7f=y%e;y0TrJ-;PZ*dw+g4&UDonGtJT*j!ma!~M;mnL#sFREV15C@#d{RGy+( zF+yF)X4ZbeS6c`S_DUaSX|@2Ld6r_cdV=U9dV(#2yvP>xQKBbcIjfJdcOcB^<3{X9 zmLeiyX~JgoF?|HW6A!#P3B3BCvqBV_%G zr^(?}e45+gl|unprHbVAD{hBhbT>M^ipqD|A4tyayAUP@y?(hS9L<%AR2H3ig&u~w zoS8@`OvC7BIVw3eAx@p1(q5d(7N33Fmp(Gz_4!P?EnCz2rGs^Je!auG@3J0yrrXY( zE+#1%r@{h3HZYh83@%y8QgO+Xfn?)EUGgF;s#t@nNHXrvS1<~|X2IDPus8PsY{QmV zya(J>1-MTX;I4?{0`PgvEqTlVc)SC6xJw+zUb3c{xtLeOg0mR-bFdVofD)8 z4}j*SrCcfx%TxjIWcr7pqp-m_itu{_LuLPADBEFYj(b^`l$HCKvp?J6XW;>+YMHRc zqA~VpC=(r8LFg)O#$ayX7QD*67Vfp-Tio2n-CS$~16~idb8{bF1jHUN;Q6q^jUQ7k z`oR1}Cbhz0+ilqB0Lrg0jSS7W=la1*fsjY@%a>^-Y#ANG6IM)uAgtnIp>pk{MW{3q Fegprn(oX;Y delta 327 zcmX@ZeUgpuG%qg~0}z}(ZJe&dG?C9*kqO9S2I9{`Kw>&W4MPoM6)OWn3S$*F14A%_ zCey?>f7L;XRsz|#7!z+XW)y?C3JSkuQmkUqGc!t)Vsa9bjM6hpCg(EAh;RTU8G*PM zWMBis2O$O?-pO~FWU<-=R8qrK1tftsF;2eAysn-F$kAjj0y=@=7Gu&a#^hp<>l73e zir7IyLItTsnYpPYsYUT6MVX0t={c!Iyg&&aAcol}0JO2Au+wycVW;H<7Lg)Opq!s3 zQxV8zV8ulsOTfZlLw|AD;9GCnXfGBSQ*;$#&4EXKho3f2Jt DrQk$P diff --git a/tests/__pycache__/test_circle.cpython-311.pyc b/tests/__pycache__/test_circle.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bdf8f14cf40e774f8c8749bc1e4cff5e010c40e5 GIT binary patch literal 2317 zcmc&#%TE(Q7@vK#j6B4}SMk9^kfg>Cr6utdCBf&xf{I3)#!cz2b#dF`?AF8vlbT@S z!Gk0ucqAS$gsXpsiLI%z*~F6hj|Wd0c;^GaD*pUh$2oB#iNoj=&PLO z1VR?zEvK+Y^(x*+JbFyx3Dm4}C^84eLd7A_H+Rc^{dJ328uD{iLzJmeIi|6gu7bO3 zTxD89HC5)6#oXp#aE`Oo2gVEx73LHY<`r&|gaw5M6cqu`gOd(>6%SyY;svBi-7Vs$ z*3LnDq!HCH2cw1>tMrH+qd=6kGz>69%r%_C&4IVzmOSGo$gJx@bvI3LP#1!+U9&{NB5nLaeV?fB&AwSFPrC}VD_6-&P?`LbDDs;|Q3x&K-yJ_Y`1#(e zx5faY;4v(6g2tM_cI2L{E!URzWhkf*@{4dyEO|EpfalPZ4y z)NOxe?7{$S8r+<02SSa-4%8NIQ@f$9E4*{Ib5r54+}kXiNvpz#2H5^B6bEZ7wkd48 zM)8rnbhIEHUANTR|ATA4S5{Us&DWB#6k}@4?9h_qX>&{E{k4_b)WK@yU3saeAocu> z@{oUrMP)e|O{lVL)yr}srKEMV8)X^K>N3N2;<~gT>_PA$96&e(Fi-3aV;@D#i=_zo zM;l3itoxKi-qT$oE>PYRMArdu`_Xk^qr0y1TG#ERJQbV(3QI(_q%6ZlNYhEp#FO9h zmM>rXTC%s9MMs?Lu{`<1*jB`rtOLwdZOimrIXvfC4-j}C8ZQ7!0>^Ph(ww!QB5BK2 z=OXFKRp*lE<6!n1;q~3Z-ku*w{90v$L~MMS`6RUFgw~=cWv@cy;`K^(EOh}<4o z1A`~}YInSQjvst#`A(_ZDfLZEiQmyG!X5;tVm7mtedKy5`C=G;W{)5|RfEbp=@GNp zU|mudC!iJtHE&HI94LZ@N-kNx?}*^@2Q|w(P!i2|y!%O3IDX9we5yS=d;HC3AFY?& z?`s?DWoHu=5^l-#+>Le5+E_8mZa|U3!;(1|4UnS0PT1FTaqFjKOcuRwR%+h%Th9ry z*pJe3`tKps;V=E2kcIC?`dqBf?Pi;N{7;^H!gG(OLp|cxV}8BS%}3Y(UXiTo3uV;` zE!z2lBeZ@cYn0#;LaLy+jCM-=)==UyDqHr6E8$Y4&&T@wAn~b)&&7PM(aqut4)Pxp zFXNB^f8V{`FoU`;F3}r2&Q>R(y!|%ceFJgUm&tH`FMSdmc?Rjw(r`r0EppGDN z1m_T69!gwBU&rRX<<5tze<+cDGuCeoF8BXo&%4JbCnqhs(Y7bQu9h|hT_Uq?b*mN( z6=7wl2r~L6iLi)3e>@U_MfyUlFARv#xV9AW<(Mxwx>+uN!5B@rX;!U@W17jBX;wDv znn(7yY0}@l6A^T-#A^i81TzG06U-tUfb2{DuSAwg35cs-MX2|lwx(qAZRi14GV|o7 zfUZGq3g`~6yh4@FLT4&80U}nh+^T8fCCY16H=tW08SP!)@-CAHFyZ&otF<%#Yt&q$ z#v+eqpWZS5xTDY~VgUnmlls3Qv{lAf6DI5OX+pj+n44fU26J1>F`WDJ@R-Lr<6jCq m?MIhE8{gf2qRuqbnWm=KzuNismpeOm>hfu;puK?sIn8Hbp#Jp$ literal 0 HcmV?d00001 diff --git a/tests/__pycache__/test_square.cpython-311.pyc b/tests/__pycache__/test_square.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4f41272d63c02ec0b91fa24a244f58bb6e37a55c GIT binary patch literal 2284 zcmcgt%}*0S6rcTQ8NOK%1SNb(3p6G~P!eN|AyNEDw5a7^nkJjlU21g;INO>?FsTV9 z93>%vBPR^uAMnp;$tE_Nc=FU+4W2mp-t4xpNYM+-&i?kj`OVC}-eKz2|E-7~Q$zwi>s*TLfU#F`2+S=+_#LV%VQV-f*o|?f$5r!P7M|d?E$J+k z)-yVD+Y;5`UB5jCn_`I#3&GD9XtovB$;EJChUN>S8e$ytdQ-h2i>b>MS#ALj6I$ZY{ryE z$gUV>*t9D$d|89VFG5mS zDxn&wxtI~3n^cpj3^L*O3DwJHK${subW=FC^ucc6{tY#qHI{q4IT$;laN*1lK#u%S zdbeJz_igm8`HQsaJMG@5-CJGTN`VepbSPh`2hf?EOBTh`vKW%WCH%Te8UU+DXasN* z##+F3rHj2K`MheQHr3`vScNXY~MMv_LdVZo$-6f1dc(6rqD>7W@TFZO0wpLDcz}TwR z!R^6<60nqjSL?}d`TVrj`j%NcgjpIzo!w`My;WN*r!ITNUMna;O9^_#wijr?qJey+ zUc6Z6Bc2+cDoy`O@MLYloVw~294siKmNNPug2SPDo2u$UJguv$-Jq)JMJ;Qf-K47c zD|Q%$TZLUh=tAg0=tbxU*d;u9{BOhj*ouHhtGNJ>t6pVU^aaYK3RLtBqw4~=qv*N- z?upJpWL*IExLYNhP%r=#mX4C1a-kqqU%wJdiF5dGiq<(1Vr{0oWS lN9=7PH?1x2OFen1rzk7A$E(ji&8*Jk_*IsOd<6&|<{wzI*`fdd literal 0 HcmV?d00001 diff --git a/tests/__pycache__/test_triangle.cpython-311.pyc b/tests/__pycache__/test_triangle.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..eb8b4c13afc8639cfaa2732d341386ab0e7932ba GIT binary patch literal 2401 zcmc&#(Qn&C7{9Zf^wuTX+)Z7}pei(B2~`IhtC$d=j8TS!mI>CUsK|1Ao(VWvdv*|1 zLkdzS?UA?cF%nW~RSEIPpAk=%7Fpr}@f2wfLFH*reBZ@M<90LRWt`7He|Mkn?)&}h z@9yVpcAP-@;?Bo*Hbuyv*ccRO%W|*@k8Q#Urw*y$Q*mfbsVEd}6>PPlQlgL>glk)b zr!4Z77L6r4Dk1xD_e&*ZrFr^m1zSQ_2)sEKxyTL}`-297x#?|r7stBTTQ1TtYYNLW zJW)04wqrrZ#JVM_HOsTauy<`Z1sF7H99#xt8X(hx72CQCB8lpn;Z#>w9CLNiu&W+=%HOORajyqF-4(>4q!-t}3&&;8 zTSl$nY@R==$;Cq_hU+c>G|BJ!%)^b=tG=EK^xT7Vhh-kKsYh(;;bd#VXSsmo+Jkxk z1IUY37XSP%{^Z?h0C5r_3lQliPJ-j*>C-W8)Fzf~MwqZ#q zGo{GLL`Lb2QlbWzlQfXdQ!wp_25#%RuNMNn5Z7SRXN72l{-RxbCyL zfX%fB^}iBVV3Pn@4tLW;;@UHbr^@0iMB0_KPoOmkAkHH^M}R9y0!ZgM7(F7uhr4ta z{{DqPUx*8EH0%E#0qpn3AOE!e%C(aH|bvDv3a)sPN~cPO^n4PF{Bfv z91&w_ck$P}uU`%Ht8p>T_$(i=e0xx(80F%LkQqkZtXYN;jvGepE^jz!XAA@P`o2f# z7$?du zUw$3EN1-1I27ttBX0>h@aICUMz3Snq5wgK?E)O=Dk0D!*4%>eCIUKFwSaAW&Lv~Nu zdwqdE5P0O^+3Ma0=&6*_4ms77SBJdTj@J&k(2m!hHbo)y9#uE(e&mgTQ`5WwRNj0ubxV@m%t&z{0D8${|Nv9 literal 0 HcmV?d00001 diff --git a/tests/test_circle.py b/tests/test_circle.py index ebcb43a8c3..53f157e71e 100644 --- a/tests/test_circle.py +++ b/tests/test_circle.py @@ -18,7 +18,7 @@ def test_2_mul(self): # Проверяет, когда радиус равен 5 def test_3_mul(self): result = perimeter_circle(5) - self.assertEqual(result, 15) + self.assertEqual(result, 31.41592653589793 ) # Проверяет, когда радиус равен 10 def test_4_mul(self): result = perimeter_circle(10) diff --git a/tests/test_square.py b/tests/test_square.py index 7145291723..65b802137c 100644 --- a/tests/test_square.py +++ b/tests/test_square.py @@ -22,11 +22,11 @@ def test_3_mul(self): # Проверяет, когда сторона равна 10 def test_4_mul(self): result = perimeter_square(10) - self.assertEqual(result, 55) + self.assertEqual(result, 40) # Проверяет, когда сторона равна 17,25 def test_5_mul(self): result = perimeter_square(17.25) - self.assertEqual(result, 56) + self.assertEqual(result, 69) diff --git a/tests/test_triangle.py b/tests/test_triangle.py index 90203920a3..1e4b9ef8df 100644 --- a/tests/test_triangle.py +++ b/tests/test_triangle.py @@ -14,7 +14,7 @@ def test_1_mul(self): # Проверяет, когда стороны равны 7.5 3.5 def test_2_mul(self): result = area_triangle(7.5, 3.5) - self.assertEqual(result, 4) + self.assertEqual(result, 13.125) # Проверяет, когда стороны равны 0 0 0 def test_3_mul(self): result = perimeter_triangle(0, 0,0) From d821c88dc13cdc628f5126d43aa808f38fe2ad36 Mon Sep 17 00:00:00 2001 From: chinhtx04 <150230149+chinhtx04@users.noreply.github.com> Date: Wed, 27 Nov 2024 03:29:42 +0300 Subject: [PATCH 24/24] Create cicd.yml --- .github/workflows/cicd.yml | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000000..e0410890c6 --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,46 @@ +name: CI - Run Unit Test + +on: + push: + branches: [ "lab5" ] + pull_request: + branches: [ "lab5" ] + workflow_dispatch: + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest] + + steps: + - name: Check out Repository + uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + + - name: Display Python version + run: python -c "import sys; print(sys.version)" + + - name: Set up Python + uses: actions/setup-python@v4.7.1 + with: + python-version: 3.8 + + - name: Run My Step + id: myStep + run: echo "::set-output name=myOutput::some value" + + - name: Set Output Variable + run: echo "myOutput=${{ steps.myStep.outputs.myOutput }}" >> $GITHUB_ENV + + - name: Install Dependencies + run: | + echo "There are no dependencies!" + - name: Run Unit Tests + run: | + python -m unittest discover -s ./tests -p "test_*.py"