From ffae2cb77bfb3263146a2de0deedf6528d4df461 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Wed, 9 Nov 2022 11:48:12 +0100 Subject: repository aanpassen voor oop2 --- week-2/Driehoek.cpp | 15 --------------- week-2/Driehoek.h | 13 ------------- week-2/Rechthoek.cpp | 14 -------------- week-2/Rechthoek.h | 13 ------------- week-2/Vorm.cpp | 13 ------------- week-2/Vorm.h | 9 --------- week-2/main.cpp | 21 --------------------- week-2/makefile | 1 - 8 files changed, 99 deletions(-) delete mode 100644 week-2/Driehoek.cpp delete mode 100644 week-2/Driehoek.h delete mode 100644 week-2/Rechthoek.cpp delete mode 100644 week-2/Rechthoek.h delete mode 100644 week-2/Vorm.cpp delete mode 100644 week-2/Vorm.h delete mode 100644 week-2/main.cpp delete mode 120000 week-2/makefile (limited to 'week-2') 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 - -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 -- cgit v1.2.3