Fixed triangle area and fixed typo in trianglePrimeter function name

1 files changed, 5 insertions, 3 deletions

diff --git a/Year 1/Programming introduction/Practice-02.10.21.cpp b/Year 1/Programming introduction/Practice-02.10.21.cpp
index f000ab8..0c524f3 100644
--- a/Year 1/Programming introduction/Practice-02.10.21.cpp
+++ b/Year 1/Programming introduction/Practice-02.10.21.cpp
@@ -79,7 +79,7 @@ void ex4() {
 // Напишете функция която намира обиколката на триъгълник определен по
 // подадени три точки
 
-double trianglePerimiter(int x1, int y1, int x2, int y2, int x3, int y3) {
+double trianglePerimeter(int x1, int y1, int x2, int y2, int x3, int y3) {
 	return pointDistance(x1, y1, x2, y2) + pointDistance(x1, y1, x3, y3) + pointDistance(x2, y2, x3, y3);
 }
 
@@ -87,7 +87,7 @@ void ex5() {
 	int x1, y1, x2, y2, x3, y3;
 	cin >> x1 >> y1 >> x2 >> y2 >> x3 >> y3;
 
-	cout << trianglePerimiter(x1, y1, x2, y2, x3, y3) << endl;
+	cout << trianglePerimeter(x1, y1, x2, y2, x3, y3) << endl;
 }
 
 // Задача шеста:
@@ -115,7 +115,9 @@ void ex6() {
 // три точки.
 
 double triangleArea(int x1, int y1, int x2, int y2, int x3, int y3) {
-	return pointDistance(x1, y1, x2, y2) * pointDistance(x1, y1, x3, y3) * pointDistance(x2, y2, x3, y3);
+	double a = pointDistance(x1, y1, x2, y2), b = pointDistance(x1, y1, x3, y3), c = pointDistance(x2, y2, x3, y3);
+	double p = (a + b + c) / 2;
+	return sqrt(p * (p - a) * (p - b) * (p - c)); // Heron's formula
 }
 
 void bonus() {