From f8b350c2b5b4063328c274b6d55c921800d10584 Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 05:59:30 -0700 Subject: [PATCH 1/6] Update calculator.py --- Smart_Calculator/calculator.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Smart_Calculator/calculator.py b/Smart_Calculator/calculator.py index 2c46b4eb..36084cfb 100644 --- a/Smart_Calculator/calculator.py +++ b/Smart_Calculator/calculator.py @@ -58,6 +58,12 @@ def calculate(): list.delete(0,END) list.insert(END,'something went wrong please enter again') + +def fact(n): + if n == 1 or n == 0: + return 1 + return n * fact(n - 1) + operations = {'ADD':add,'ADDITION':add, 'SUM':add, 'PLUS':add, 'SUB':sub, 'DIFFERENCE':sub, 'MINUS': sub, 'SUBTRACT':sub, 'DIFF':sub, 'LCM':lcm, 'HCF':hcf, 'PRODUCT':mul, 'MULTIPLICATION':mul, From f877f3c4ac7b47fd4e1ee95fd0ed050b81c59f9f Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 06:36:16 -0700 Subject: [PATCH 2/6] Good editing? --- Smart_Calculator/calculator.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Smart_Calculator/calculator.py b/Smart_Calculator/calculator.py index 36084cfb..013688dd 100644 --- a/Smart_Calculator/calculator.py +++ b/Smart_Calculator/calculator.py @@ -1,4 +1,6 @@ from tkinter import * +PI = 3.14159 + def add(a,b): return a + b @@ -64,6 +66,15 @@ def fact(n): return 1 return n * fact(n - 1) + +def circle_area(radius): + return PI * (float(radius) ** 2) + + +def circle_perimeter(radius): + return PI * float(radius) * 2 + + operations = {'ADD':add,'ADDITION':add, 'SUM':add, 'PLUS':add, 'SUB':sub, 'DIFFERENCE':sub, 'MINUS': sub, 'SUBTRACT':sub, 'DIFF':sub, 'LCM':lcm, 'HCF':hcf, 'PRODUCT':mul, 'MULTIPLICATION':mul, From b5c4217f5ad2f1380a5bd4ac63302caacb678a9e Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 06:38:53 -0700 Subject: [PATCH 3/6] Update calculator.py --- Smart_Calculator/calculator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Smart_Calculator/calculator.py b/Smart_Calculator/calculator.py index 013688dd..32a23d13 100644 --- a/Smart_Calculator/calculator.py +++ b/Smart_Calculator/calculator.py @@ -68,11 +68,11 @@ def fact(n): def circle_area(radius): - return PI * (float(radius) ** 2) + return PI * (radius ** 2) def circle_perimeter(radius): - return PI * float(radius) * 2 + return PI * radius * 2 operations = {'ADD':add,'ADDITION':add, 'SUM':add, 'PLUS':add, From 14ac1c494f394ae22a3c5674d730b35fe1ddf2d0 Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 06:40:44 -0700 Subject: [PATCH 4/6] Update calculator_test.py --- Smart_Calculator/calculator_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Smart_Calculator/calculator_test.py b/Smart_Calculator/calculator_test.py index e44e858c..c2877e03 100644 --- a/Smart_Calculator/calculator_test.py +++ b/Smart_Calculator/calculator_test.py @@ -1,5 +1,5 @@ import unittest -from calculator import add, sub, mul, div, mod, lcm, hcf +from calculator import add, sub, mul, div, mod, lcm, hcf, fact, circle_area, circle_perimeter class TestAdd(unittest.TestCase): def test_add_function(self): @@ -30,4 +30,4 @@ def test_hcf_function(self): self.assertEqual(hcf(54, 24), 6) if __name__ == '__main__': - unittest.main(verbosity=2) \ No newline at end of file + unittest.main(verbosity=2) From 9186ed0fb1bc1f084a4501868fb07dc8c1f41852 Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 06:41:55 -0700 Subject: [PATCH 5/6] Clean up imports in calculator_test.py Removed unused imports from calculator_test.py. --- Smart_Calculator/calculator_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Smart_Calculator/calculator_test.py b/Smart_Calculator/calculator_test.py index c2877e03..78b53ccf 100644 --- a/Smart_Calculator/calculator_test.py +++ b/Smart_Calculator/calculator_test.py @@ -1,5 +1,5 @@ import unittest -from calculator import add, sub, mul, div, mod, lcm, hcf, fact, circle_area, circle_perimeter +from calculator import add, sub, mul, div, mod, lcm, hcf class TestAdd(unittest.TestCase): def test_add_function(self): From 07ccebd6e62dd8557edf368c7c1ed504be807e98 Mon Sep 17 00:00:00 2001 From: Anas-AbdelRaoof Date: Tue, 19 May 2026 06:48:17 -0700 Subject: [PATCH 6/6] Update TriangleCalculator.py --- Triangle Calculator/TriangleCalculator.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Triangle Calculator/TriangleCalculator.py b/Triangle Calculator/TriangleCalculator.py index def30492..fcaf8590 100644 --- a/Triangle Calculator/TriangleCalculator.py +++ b/Triangle Calculator/TriangleCalculator.py @@ -8,4 +8,9 @@ #Calculate the area area=(sp*(sp-s1)*(sp-s2)*(sp-s3))**0.5 -print('The area of the triangle is %0.4f'%area) \ No newline at end of file +#Calculate the perimeter +perimeter = s1 + s2 + s3 + +print('The area of the triangle is %0.4f'%area) + +print('The perimeter of the triangle is %0.4f'%perimeter)