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-4/Persoon.cpp | 22 ---------------------- week-4/Persoon.h | 16 ---------------- week-4/Spel.cpp | 29 ----------------------------- week-4/Spel.h | 18 ------------------ week-4/main.cpp | 26 -------------------------- week-4/makefile | 1 - 6 files changed, 112 deletions(-) delete mode 100644 week-4/Persoon.cpp delete mode 100644 week-4/Persoon.h delete mode 100644 week-4/Spel.cpp delete mode 100644 week-4/Spel.h delete mode 100644 week-4/main.cpp delete mode 120000 week-4/makefile (limited to 'week-4') diff --git a/week-4/Persoon.cpp b/week-4/Persoon.cpp deleted file mode 100644 index de5195d..0000000 --- a/week-4/Persoon.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "Persoon.h" - -bool Persoon::operator < ( const Persoon& persoon ) const { - return naam < persoon.naam; -} - -Persoon::Persoon(std::string naam) { - this->naam = naam; -} - -const std::string& Persoon::getNaam() const { - return naam; -} - -int Persoon::getLeeftijd() const { - return leeftijd; -} - -void Persoon::setLeeftijd(int leeftijd) { - this->leeftijd = leeftijd; -} - diff --git a/week-4/Persoon.h b/week-4/Persoon.h deleted file mode 100644 index df4a3f2..0000000 --- a/week-4/Persoon.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include - -class Persoon { - public: - Persoon(std::string naam); - const std::string& getNaam() const; - int getLeeftijd() const; - void setLeeftijd(int leeftijd); - bool operator < (const Persoon& other) const; - - private: - std::string naam; - int leeftijd; -}; diff --git a/week-4/Spel.cpp b/week-4/Spel.cpp deleted file mode 100644 index 5ddc355..0000000 --- a/week-4/Spel.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Spel.h" - -Persoon* Spel::getPersoon(const std::string naam) const { - auto iFind = scores.find(naam); - if (iFind == scores.end()) - return nullptr; - else - return const_cast(&iFind->first); -} - -void Spel::setScore(std::string naam, int score) { - scores[naam] = score; -} - -void Spel::addScore(std::string naam, int score) { - scores[naam] += score; -} - -int Spel::getScore(std::string naam) const { - auto iFind = scores.find(naam); - if (iFind == scores.end()) - return 0; - else - return iFind->second; -} - -std::map& Spel::getScores() { - return scores; -} diff --git a/week-4/Spel.h b/week-4/Spel.h deleted file mode 100644 index 9ed04ba..0000000 --- a/week-4/Spel.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include -#include - -#include "Persoon.h" - -class Spel { - public: - void setScore(std::string naam, int score); - void addScore(std::string naam, int score); - int getScore(std::string naam) const; - Persoon* getPersoon(std::string naam) const; - std::map& getScores(); - - private: - std::map scores; -}; diff --git a/week-4/main.cpp b/week-4/main.cpp deleted file mode 100644 index b81a711..0000000 --- a/week-4/main.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Spel.h" -#include "Persoon.h" - -#include - -int main() -{ - Spel spel; - spel.setScore("Bert", 15); - std::cout << spel.getScore("Bert") << std::endl; // uikomst: 15 - Persoon *bert = spel.getPersoon("Bert"); - bert->setLeeftijd(103); - spel.addScore("Bert", 16); - std::cout << spel.getScore("Bert") << std::endl; // uikomst: 31 - bert = spel.getPersoon("Bert"); - std::cout << bert->getLeeftijd() << std::endl; // uikomst: 103 - spel.setScore("Joan", 512); - spel.setScore("Arthur", 1024); - for ( auto pair : spel.getScores() ) - { - std::cout << pair.first.getNaam() << "\t" - << pair.first.getLeeftijd() << "\t" - << pair.second << std::endl; - } - return 0; -} diff --git a/week-4/makefile b/week-4/makefile deleted file mode 120000 index a4e84c6..0000000 --- a/week-4/makefile +++ /dev/null @@ -1 +0,0 @@ -../week.mk \ No newline at end of file -- cgit v1.2.3