aboutsummaryrefslogtreecommitdiff
path: root/week-2
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2022-11-09 11:48:12 +0100
committerlonkaars <loek@pipeframe.xyz>2022-11-09 11:48:12 +0100
commitffae2cb77bfb3263146a2de0deedf6528d4df461 (patch)
tree88e4b61087069f8ce5badadbc6264d20b8a051d5 /week-2
parentd797758769d033c64babdf77ea6b64262f792b23 (diff)
repository aanpassen voor oop2
Diffstat (limited to 'week-2')
-rw-r--r--week-2/Driehoek.cpp15
-rw-r--r--week-2/Driehoek.h13
-rw-r--r--week-2/Rechthoek.cpp14
-rw-r--r--week-2/Rechthoek.h13
-rw-r--r--week-2/Vorm.cpp13
-rw-r--r--week-2/Vorm.h9
-rw-r--r--week-2/main.cpp21
l---------week-2/makefile1
8 files changed, 0 insertions, 99 deletions
diff --git a/week-2/Driehoek.cpp b/week-2/Driehoek.cpp
deleted file mode 100644
index 1c1323c..0000000
--- a/week-2/Driehoek.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "Driehoek.h"
-
-Driehoek::Driehoek(double b, double h) {
- breedte = b;
- hoogte = h;
-}
-
-double Driehoek::getSomGraden() {
- return 180;
-}
-
-double Driehoek::getOppervlakte() {
- return breedte * hoogte * 0.5f;
-}
-
diff --git a/week-2/Driehoek.h b/week-2/Driehoek.h
deleted file mode 100644
index f8a3a37..0000000
--- a/week-2/Driehoek.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "Vorm.h"
-
-class Driehoek : public Vorm {
- public:
- Driehoek(double breedte, double hoogte);
- virtual double getOppervlakte();
- virtual double getSomGraden();
- private:
- double breedte;
- double hoogte;
-};
diff --git a/week-2/Rechthoek.cpp b/week-2/Rechthoek.cpp
deleted file mode 100644
index 1f7b313..0000000
--- a/week-2/Rechthoek.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "Rechthoek.h"
-
-Rechthoek::Rechthoek(double b, double h) {
- breedte = b;
- hoogte = h;
-}
-
-double Rechthoek::getSomGraden() {
- return 360;
-}
-
-double Rechthoek::getOppervlakte() {
- return breedte * hoogte;
-}
diff --git a/week-2/Rechthoek.h b/week-2/Rechthoek.h
deleted file mode 100644
index 4f526f9..0000000
--- a/week-2/Rechthoek.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "Vorm.h"
-
-class Rechthoek : public Vorm {
- public:
- Rechthoek(double breedte, double hoogte);
- virtual double getSomGraden();
- virtual double getOppervlakte();
- private:
- double breedte;
- double hoogte;
-};
diff --git a/week-2/Vorm.cpp b/week-2/Vorm.cpp
deleted file mode 100644
index c919d08..0000000
--- a/week-2/Vorm.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "Vorm.h"
-
-Vorm::Vorm() {
- return;
-}
-
-double Vorm::getOppervlakte() {
- return 0;
-}
-
-double Vorm::getSomGraden() {
- return 0;
-}
diff --git a/week-2/Vorm.h b/week-2/Vorm.h
deleted file mode 100644
index 17cf486..0000000
--- a/week-2/Vorm.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-class Vorm {
- public:
- Vorm();
- virtual double getOppervlakte();
- virtual double getSomGraden();
-};
-
diff --git a/week-2/main.cpp b/week-2/main.cpp
deleted file mode 100644
index 69db85b..0000000
--- a/week-2/main.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Do not adapt this file!!!
- */
-#include "Driehoek.h"
-#include "Rechthoek.h"
-
-#include <iostream>
-
-int main()
-{
- Vorm *driehoek = new Driehoek( 6.0, 8.0 );
- Vorm *rechthoek = new Rechthoek( 6.0, 8.0 );
-
- std::cout << driehoek ->getOppervlakte() << " " << driehoek ->getSomGraden() << std::endl;
- std::cout << rechthoek->getOppervlakte() << " " << rechthoek->getSomGraden() << std::endl;
-
- delete driehoek;
- delete rechthoek;
-
- return 0;
-}
diff --git a/week-2/makefile b/week-2/makefile
deleted file mode 120000
index a4e84c6..0000000
--- a/week-2/makefile
+++ /dev/null
@@ -1 +0,0 @@
-../week.mk \ No newline at end of file