From 730189c846b762c42fba955ca6a01d3a2fbf7acf Mon Sep 17 00:00:00 2001 From: Angeld55 Date: Thu, 19 Sep 2019 21:19:25 +0300 Subject: Rename Polymorphism/Triangle.hpp to Polymorphism/Figures/Triangle.hpp --- Polymorphism/Figures/Triangle.hpp | 21 +++++++++++++++++++++ Polymorphism/Triangle.hpp | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 Polymorphism/Figures/Triangle.hpp delete mode 100644 Polymorphism/Triangle.hpp diff --git a/Polymorphism/Figures/Triangle.hpp b/Polymorphism/Figures/Triangle.hpp new file mode 100644 index 0000000..a6599bf --- /dev/null +++ b/Polymorphism/Figures/Triangle.hpp @@ -0,0 +1,21 @@ +public: + Triangle(int x1, int y1, int x2, int y2, int x3, int y3) :Figure(3) + { + setPoint(0, x1, y1); + setPoint(1, x2, y2); + setPoint(2, x3, y3); + } + double getSide(int side) + { + return getPoint(side).getDistTo(getPoint((side+1)%3)); + } + double getPer() + { + return getSide(0)+getSide(1)+getSide(2); + } + double getArea() + { + double halfP = getPer()/2; + return sqrt(halfP * (halfP-getSide(0))*(halfP-getSide(1))*(halfP-getSide(2))); + } +}; diff --git a/Polymorphism/Triangle.hpp b/Polymorphism/Triangle.hpp deleted file mode 100644 index 8372464..0000000 --- a/Polymorphism/Triangle.hpp +++ /dev/null @@ -1,21 +0,0 @@ -public: - Triangle(int x1, int y1, int x2, int y2, int x3, int y3) :Figure(3) - { - setPoint(0, x1, y1); - setPoint(1, x2, y2); - setPoint(2, x3, y3); - } - double getSide(int side) - { - return getPoint(side).getDistTo(getPoint((side+1)%3)); - } - double getPer() - { - return getSide(0)+getSide(1)+getSide(2); - } - double getArea() - { - double halfP = getPer()/2; - return sqrt(halfP * (halfP-getSide(0))*(halfP-getSide(1))*(halfP-getSide(2))); - } -}; \ No newline at end of file -- cgit v1.3.1-23-gd82d