Website Summary Files Commits Branches @commit @diff @stats
path: root / Polymorphism
diff options
context:
space:
mode:
Commit6b1e347aef7436ab55a405da0a780ca4aa6b011a (patch)
Author
 Angeld55 <achi_d@abv.bg>
2019-09-19 21:23:20 +0300
Committer
 GitHub <noreply@github.com>
2019-09-19 21:23:20 +0300
Filesaf1630a0f2e994af167f52bbc942cb6280ce0826 /Polymorphism
Object-oriented_programming_FMI-6b1e347aef7436ab55a405da0a780ca4aa6b011a.tar
Object-oriented_programming_FMI-6b1e347aef7436ab55a405da0a780ca4aa6b011a.tar.gz
Object-oriented_programming_FMI-6b1e347aef7436ab55a405da0a780ca4aa6b011a.zip
Parentdb44aea398b738a795ce6ed681856d16f554dba7 (diff)
Update Triangle.hpp
1 files changed, 4 insertions, 0 deletions
-rw-r--r--Polymorphism/Figures/Triangle.hpp4
diff --git a/Polymorphism/Figures/Triangle.hpp b/Polymorphism/Figures/Triangle.hpp
index a6599bf..b933060 100644
--- a/Polymorphism/Figures/Triangle.hpp
+++ b/Polymorphism/Figures/Triangle.hpp
@@ -1,3 +1,6 @@
+#include "Figure.hpp"
+class Triangle
+{
public:
Triangle(int x1, int y1, int x2, int y2, int x3, int y3) :Figure(3)
{
@@ -15,6 +18,7 @@ public:
}
double getArea()
{
+ //Херонова формула
double halfP = getPer()/2;
return sqrt(halfP * (halfP-getSide(0))*(halfP-getSide(1))*(halfP-getSide(2)));
}