From d080c7888b81955bad2ed78d58ad910526b5132a Mon Sep 17 00:00:00 2001 From: smartiqa Date: Fri, 26 Mar 2021 14:48:39 +0300 Subject: [PATCH 1/5] L-04: Triangle added --- triangle.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 triangle.py diff --git a/triangle.py b/triangle.py new file mode 100644 index 0000000000..fb41f60a52 --- /dev/null +++ b/triangle.py @@ -0,0 +1,6 @@ +def area(a, b, c): + return (a + b + c) / 2 + + +def perimeter(a, b, c): + return a + b + c From 51c40ebfd0e0b65f52fe5e54740cbb038e492db3 Mon Sep 17 00:00:00 2001 From: smartiqa Date: Fri, 26 Mar 2021 14:52:26 +0300 Subject: [PATCH 2/5] L-04: Doc updated for triangle --- docs/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 63f8727939..0825daceef 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,8 +3,10 @@ - Circle: S = πR² - Rectangle: S = ab - Square: S = a² +- Triangle: S = (a + b + c) / 2 ## Perimeter - Circle: P = 2πR - Rectangle: P = 2a + 2b -- Square: P = 4a \ No newline at end of file +- Square: P = 4a +- Triangle: P = a + b + c From d76db2ac7f69cc920ae2e6f669fb0671a7fa7d71 Mon Sep 17 00:00:00 2001 From: "Daniil.K" Date: Tue, 30 Mar 2021 17:57:42 +0300 Subject: [PATCH 3/5] L-04: Add calculate.py --- calculate.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 calculate.py diff --git a/calculate.py b/calculate.py new file mode 100644 index 0000000000..6dc22cf124 --- /dev/null +++ b/calculate.py @@ -0,0 +1,33 @@ +import circle +import square + + +figs = ['circle', 'square'] +funcs = ['perimeter', 'area'] +sizes = {} + +def calc(fig, func, size): + assert fig in figs + assert func in funcs + + result = eval(f'{fig}.{func}(*{size})') + print(f'{func} of {fig} is {result}') + +if __name__ == "__main__": + func = '' + fig = '' + size = list() + + while fig not in figs: + fig = input(f"Enter figure name, avaliable are {figs}:\n") + + while func not in funcs: + func = input(f"Enter function name, avaliable are {funcs}:\n") + + while len(size) != sizes.get(f"{func}-{fig}", 1): + size = list(map(int, input("Input figure sizes separated by space, 1 for circle and square\n").split(' '))) + + calc(fig, func, size) + + + From b5b0fae727ca72c317c383b39c0af73d6adcd81c Mon Sep 17 00:00:00 2001 From: "Daniil.K" Date: Tue, 30 Mar 2021 18:02:23 +0300 Subject: [PATCH 4/5] L-04: Update docs for calculate.py --- docs/README.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/README.md b/docs/README.md index 0825daceef..209eaca532 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,12 +1,21 @@ + +# How to use calculator: +1. Run `python calculate.py` +2. Enter the figure name. Available are Circle, Square. +3. Enter the function: Area or Perimeter. +4. Enter figure sizes. Radius for circle, one side for square. +5. Get the answer! + # Math formulas ## Area -- Circle: S = πR² -- Rectangle: S = ab -- Square: S = a² -- Triangle: S = (a + b + c) / 2 +- Circle: `S = πR²` +- Rectangle: `S = ab` +- Square: `S = a²` +- Triangle: `S = sqrt(p * (p-a) * (p-b) * (p-c))` where p is semiperimeter ## Perimeter -- Circle: P = 2πR -- Rectangle: P = 2a + 2b -- Square: P = 4a -- Triangle: P = a + b + c +- Circle: `P = 2πR` +- Rectangle: `P = 2a + 2b` +- Square: `P = 4a` +- Triangle: `P = a + b + c` + From b0a594c8432f917256eec380c5998522c4040b0f Mon Sep 17 00:00:00 2001 From: Koteika Date: Sat, 27 Jun 2026 14:52:45 +0900 Subject: [PATCH 5/5] change README.md --- docs/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 209eaca532..dcc59f1334 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ - +0 # How to use calculator: 1. Run `python calculate.py` 2. Enter the figure name. Available are Circle, Square. @@ -19,3 +19,4 @@ - Square: `P = 4a` - Triangle: `P = a + b + c` +)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))