Website Summary Files Commits Branches @commit @diff @stats
path: root / Polymorphism
diff options
context:
space:
mode:
Commite4d18fcd53413b9b483a42179f1789bc6cf4f646 (patch)
Author
 Angeld55 <achi_d@abv.bg>
2019-09-24 00:09:03 +0300
Committer
 GitHub <noreply@github.com>
2019-09-24 00:09:03 +0300
Files7ac8ab0718e26ec4d6382a9bd388e9dea0b2acf9 /Polymorphism
Object-oriented_programming_FMI-e4d18fcd53413b9b483a42179f1789bc6cf4f646.tar
Object-oriented_programming_FMI-e4d18fcd53413b9b483a42179f1789bc6cf4f646.tar.gz
Object-oriented_programming_FMI-e4d18fcd53413b9b483a42179f1789bc6cf4f646.zip
Parentabf529bc12fb952692e2426d65e39ecbde8a11d4 (diff)
Add files via upload
diff --git a/Polymorphism/Figures/Circle.hpp b/Polymorphism/Figures/Circle.hpp
index b312c42..282ed36 100644
--- a/Polymorphism/Figures/Circle.hpp
+++ b/Polymorphism/Figures/Circle.hpp
@@ -1,3 +1,4 @@
+#pragma once
#include "Figure.hpp"
class Circle : public Figure
{
diff --git a/Polymorphism/Figures/Figure.hpp b/Polymorphism/Figures/Figure.hpp
index e25cdd5..cd13b7d 100644
--- a/Polymorphism/Figures/Figure.hpp
+++ b/Polymorphism/Figures/Figure.hpp
@@ -1,3 +1,5 @@
+#pragma once
+
#include<iostream>
#include <cmath>
@@ -42,7 +44,7 @@ public:
//То е и логично - лице на правоъгълник и лице на триъгълник се смята по различен начин, нали?
// Не можем още тук да дефинираме някаква обща формула, която да върши работа за всички фигури.
virtual double getPer() = 0;
- virtual double getArea()= 0;
+ virtual double getArea()= 0;
};
diff --git a/Polymorphism/Figures/Rectangle.hpp b/Polymorphism/Figures/Rectangle.hpp
index 7021886..e1a4ea8 100644
--- a/Polymorphism/Figures/Rectangle.hpp
+++ b/Polymorphism/Figures/Rectangle.hpp
@@ -1,3 +1,4 @@
+#pragma once
#include "Figure.hpp"
class Rectangle : public Figure
{
diff --git a/Polymorphism/Figures/Triangle.hpp b/Polymorphism/Figures/Triangle.hpp
index 5ac5a35..5d16111 100644
--- a/Polymorphism/Figures/Triangle.hpp
+++ b/Polymorphism/Figures/Triangle.hpp
@@ -1,5 +1,7 @@
+#pragma once
+
#include "Figure.hpp"
-class Triangle
+class Triangle : public Figure
{
public:
Triangle(int x1, int y1, int x2, int y2, int x3, int y3) :Figure(3)
diff --git a/Polymorphism/Figures/main.cpp b/Polymorphism/Figures/main.cpp
index 39336c3..2b4eb23 100644
--- a/Polymorphism/Figures/main.cpp
+++ b/Polymorphism/Figures/main.cpp
@@ -1,4 +1,8 @@
-#include "Figure.h"
+
+#include "Figure.hpp"
+#include "Triangle.hpp"
+#include "Rectangle.hpp"
+#include "Circle.hpp"
int main()