From 380e625005cd6d1862406553dc0aae21c96cca71 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Sun, 13 Nov 2022 00:38:01 +0100 Subject: [PATCH] Minor release --- CMakeLists.txt | 2 +- src/TopTeamBedrijfssimulaties/Starters/Starters.cpp | 5 ++++- src/main.cpp | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45fd00c..c5d8b64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if ( MSVC ) endif() set (VERSION_MAJOR 1) -set (VERSION_MINOR 1) +set (VERSION_MINOR 2) include(GNUInstallDirs) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY diff --git a/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp b/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp index 6aa073a..3da23ad 100644 --- a/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp +++ b/src/TopTeamBedrijfssimulaties/Starters/Starters.cpp @@ -269,7 +269,10 @@ float Starters_c::calculate() // ingevuld door constructor // C Bestellingen - this->C1 = 2000; + if (this->Standard == MachineStandard::Standard) + this->C1 = 2000; + else if (this->Standard == MachineStandard::Luxe) + this->C1 = 400; this->C2 = AdditionalOrdersSalesPrice(this->Standard, this->B1); this->C3 = AdditionalOrdersProfitMargin(this->Standard, this->B2); this->C4 = AdditionalOrdersQuality(this->Standard, this->B3); diff --git a/src/main.cpp b/src/main.cpp index f8e8cca..1873aeb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,10 +7,12 @@ int main(int argc, char *argv[]) Starters_c gameSession1(Starters_c::MachineStandard::Standard, 3, 2000, 2000, 2000, 40, 40, 6000, 45000); Starters_c gameSession2(Starters_c::MachineStandard::Luxe, 1000, 1000, 105, 25, 9000, 25000); Starters_c gameSession3(Starters_c::MachineStandard::Luxe, 1000, 1000, 1000, 105, 25, 9000, 25000); + Starters_c test(Starters_c::MachineStandard::Luxe, 1000, 1000, 1000, 105, 50, 9000, 25000); debugln("Game Session 1: " << gameSession1.calculate()); debugln("Game Session 2: " << gameSession2.calculate()); debugln("Game Session 3: " << gameSession3.calculate() << " " << gameSession3.getResult() / gameSession2.getResult() * 100 << "% better then before"); + debugln("Test: " << test.calculate() << " " << test.getResult() / gameSession3.getResult() * 100 << "% better then before"); return 0; } \ No newline at end of file