From 8ba9aeb3cea847b63a91ac378a2a6db758682460 Mon Sep 17 00:00:00 2001 From: smartiqa Date: Thu, 4 Mar 2021 14:54:08 +0300 Subject: [PATCH 1/4] L-03: Circle and square added --- circle.py | 10 ++++++++++ square.py | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 circle.py create mode 100644 square.py diff --git a/circle.py b/circle.py new file mode 100644 index 0000000..c3eb864 --- /dev/null +++ b/circle.py @@ -0,0 +1,10 @@ +import math + + +def area(r): + return math.pi * r * r + + +def perimeter(r): + return 2 * math.pi * r + diff --git a/square.py b/square.py new file mode 100644 index 0000000..0f98724 --- /dev/null +++ b/square.py @@ -0,0 +1,7 @@ + +def area(a): + return a * a + + +def perimeter(a): + return 4 * a From d078c8d9ee6155f3cb0e577d28d337b791de28e2 Mon Sep 17 00:00:00 2001 From: smartiqa Date: Thu, 4 Mar 2021 14:55:29 +0300 Subject: [PATCH 2/4] L-03: Docs added --- docs/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/README.md diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..63f8727 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,10 @@ +# Math formulas +## Area +- Circle: S = πR² +- Rectangle: S = ab +- Square: S = a² + +## Perimeter +- Circle: P = 2πR +- Rectangle: P = 2a + 2b +- Square: P = 4a \ No newline at end of file From a8feff4dde0220cfb0aa9515a739e615f3a94ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=8E=D1=82=D1=80=D1=8E=D0=BC=D0=BE=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9C=D0=B8=D1=85=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=87?= Date: Sun, 31 Mar 2024 23:20:31 +0300 Subject: [PATCH 3/4] L-03: Added rectangle.py --- 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 0000000..42d1e93 --- /dev/null +++ b/rectangle.py @@ -0,0 +1,5 @@ +def area(a, b): + return a * b + +def perimeter(a, b): + return a + b From e900bcf4a7e17f53277e620b883caaf259ce7cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=8E=D1=82=D1=80=D1=8E=D0=BC=D0=BE=D0=B2=20=D0=A1?= =?UTF-8?q?=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9C=D0=B8=D1=85=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=BE=D0=B2=D0=B8=D1=87?= Date: Sun, 31 Mar 2024 23:26:23 +0300 Subject: [PATCH 4/4] L-03: Added triangle.py and fixed rectangle perimeter bug --- rectangle.py | 2 +- triangle.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 triangle.py diff --git a/rectangle.py b/rectangle.py index 42d1e93..c20fc69 100644 --- a/rectangle.py +++ b/rectangle.py @@ -2,4 +2,4 @@ def area(a, b): return a * b def perimeter(a, b): - return a + b + return 2 * (a + b) diff --git a/triangle.py b/triangle.py new file mode 100644 index 0000000..fa3495d --- /dev/null +++ b/triangle.py @@ -0,0 +1,5 @@ +def area(a, h): + return a * h / 2 + +def perimeter(a, b, c): + return a + b + c