sani7/TopTeamBedrijfssimulaties-Starters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor release

Browse Source
This commit is contained in:
Sander Speetjens
2022-11-13 00:38:01 +01:00
parent 012c2bfcab
commit 380e625005
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -14,7 +14,7 @@ if ( MSVC )
endif() endif()
set (VERSION_MAJOR 1) set (VERSION_MAJOR 1)
set (VERSION_MINOR 1) set (VERSION_MINOR 2)
include(GNUInstallDirs) include(GNUInstallDirs)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY

3
src/TopTeamBedrijfssimulaties/Starters/Starters.cpp
View File

@@ -269,7 +269,10 @@ float Starters_c::calculate()
// ingevuld door constructor // ingevuld door constructor
// C Bestellingen // C Bestellingen
if (this->Standard == MachineStandard::Standard)
this->C1 = 2000; this->C1 = 2000;
else if (this->Standard == MachineStandard::Luxe)
this->C1 = 400;
this->C2 = AdditionalOrdersSalesPrice(this->Standard, this->B1); this->C2 = AdditionalOrdersSalesPrice(this->Standard, this->B1);
this->C3 = AdditionalOrdersProfitMargin(this->Standard, this->B2); this->C3 = AdditionalOrdersProfitMargin(this->Standard, this->B2);
this->C4 = AdditionalOrdersQuality(this->Standard, this->B3); this->C4 = AdditionalOrdersQuality(this->Standard, this->B3);

2
src/main.cpp
View File

@@ -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 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 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 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 1: " << gameSession1.calculate());
debugln("Game Session 2: " << gameSession2.calculate()); debugln("Game Session 2: " << gameSession2.calculate());
debugln("Game Session 3: " << gameSession3.calculate() << " " << gameSession3.getResult() / gameSession2.getResult() * 100 << "% better then before"); 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; return 0;
} }