From c94d0c347fdbd8acc774df4ac17617a3f63e4507 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 9 Jul 2017 23:48:06 +0200 Subject: Delete old codebase This change removes version 1 of the OpenDC simulator codebase as it will be replaced by a complete rewrite in the Kotlin language. --- Testing/Testing.vcxproj | 181 --------------------- Testing/Testing.vcxproj.filters | 50 ------ Testing/include/modeling/DatacenterTest.h | 35 ---- Testing/include/modeling/EntityTest.h | 10 -- Testing/include/modeling/MachineTest.h | 39 ----- Testing/include/modeling/RackTest.h | 21 --- Testing/include/modeling/RoomTest.h | 24 --- Testing/include/modeling/TypeIndexTest.h | 28 ---- Testing/include/simulation/SimulationHistoryTest.h | 48 ------ .../simulation/workloads/SimpleSchedulerTest.h | 106 ------------ .../simulation/workloads/WorkloadHistoryTest.h | 15 -- .../include/simulation/workloads/WorkloadTest.h | 34 ---- Testing/src/main.cpp | 21 --- 13 files changed, 612 deletions(-) delete mode 100644 Testing/Testing.vcxproj delete mode 100644 Testing/Testing.vcxproj.filters delete mode 100644 Testing/include/modeling/DatacenterTest.h delete mode 100644 Testing/include/modeling/EntityTest.h delete mode 100644 Testing/include/modeling/MachineTest.h delete mode 100644 Testing/include/modeling/RackTest.h delete mode 100644 Testing/include/modeling/RoomTest.h delete mode 100644 Testing/include/modeling/TypeIndexTest.h delete mode 100644 Testing/include/simulation/SimulationHistoryTest.h delete mode 100644 Testing/include/simulation/workloads/SimpleSchedulerTest.h delete mode 100644 Testing/include/simulation/workloads/WorkloadHistoryTest.h delete mode 100644 Testing/include/simulation/workloads/WorkloadTest.h delete mode 100644 Testing/src/main.cpp (limited to 'Testing') diff --git a/Testing/Testing.vcxproj b/Testing/Testing.vcxproj deleted file mode 100644 index 3d97b600..00000000 --- a/Testing/Testing.vcxproj +++ /dev/null @@ -1,181 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Testing - Win32 - - - Testing - x64 - - - - {C0AA3574-A672-43EB-8C9D-A22C80230859} - Testing - 8.1 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - v141 - - - v141 - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - true - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - - - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - - - - - Level3 - Disabled - true - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - MultiThreadedDebug - - - $(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - - - true - true - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - - - - - Level3 - MaxSpeed - true - true - true - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - MultiThreaded - - - true - true - $(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\Testing;$(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - - - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - MultiThreaded - - - - - Simulator.lib;gtest.lib;gtest_main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)$(Platform)\Testing;$(SolutionDir)external\gtest;%(AdditionalLibraryDirectories) - - - $(SolutionDir)external;$(SolutionDir)Simulator\include;$(ProjectDir)include;%(AdditionalIncludeDirectories) - MultiThreaded - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Testing/Testing.vcxproj.filters b/Testing/Testing.vcxproj.filters deleted file mode 100644 index c8e42539..00000000 --- a/Testing/Testing.vcxproj.filters +++ /dev/null @@ -1,50 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Testing/include/modeling/DatacenterTest.h b/Testing/include/modeling/DatacenterTest.h deleted file mode 100644 index 0b64c88a..00000000 --- a/Testing/include/modeling/DatacenterTest.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once -#include "modeling\Datacenter.h" -#include "simulation\workloads\SimpleScheduler.h" - -#include - -TEST(DatacenterTest, GetAddRoomOfType) -{ - Simulation::Scheduler* scheduler = new Simulation::SimpleScheduler(); - Modeling::Datacenter datacenter(scheduler); - - int first = 4, second = 1; - datacenter.addRoomOfType(first); - datacenter.addRoomOfType(second); - double third = 3.0; - datacenter.addRoomOfType(third); - - ASSERT_EQ(datacenter.getRoomsOfType().at(0), 4); - ASSERT_EQ(datacenter.getRoomsOfType().at(1), 1); - ASSERT_EQ(datacenter.getRoomsOfType().at(0), 3.0); -} - -TEST(DatacenterTest, GetSetScheduler) -{ - Simulation::Scheduler* scheduler = new Simulation::SimpleScheduler(); - Simulation::Scheduler* secondScheduler = new Simulation::SimpleScheduler(); - - Modeling::Datacenter datacenter(scheduler); - - ASSERT_EQ(datacenter.getScheduler().get(), scheduler); - - datacenter.setScheduler(secondScheduler); - - ASSERT_EQ(datacenter.getScheduler().get(), secondScheduler); -} \ No newline at end of file diff --git a/Testing/include/modeling/EntityTest.h b/Testing/include/modeling/EntityTest.h deleted file mode 100644 index ff7293ff..00000000 --- a/Testing/include/modeling/EntityTest.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once -#include "modeling\Entity.h" - -#include - -TEST(EntityTest, Constructor) -{ - Modeling::Entity e(10); - ASSERT_EQ(e.id, 10); -} \ No newline at end of file diff --git a/Testing/include/modeling/MachineTest.h b/Testing/include/modeling/MachineTest.h deleted file mode 100644 index 6bba9d0d..00000000 --- a/Testing/include/modeling/MachineTest.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#include "modeling\Machine.h" - -#include - -TEST(MachineTest, GetSpeed) -{ - Modeling::Machine m(100); - - ASSERT_EQ(m.getSpeed(), 100); -} - -TEST(MachineTest, IsBusy) -{ - Modeling::Machine m(100); - std::shared_ptr shrdWorkload = std::make_shared(150, 1, 1, 1); - ASSERT_FALSE(m.isBusy()); - - m.giveTask(std::weak_ptr(shrdWorkload)); - - ASSERT_TRUE(m.isBusy()); -} - -TEST(MachineTest, Tick) -{ - Modeling::Machine m(100); - std::shared_ptr shrdWorkload = std::make_shared(150, 1, 1, 1); - m.giveTask(std::weak_ptr(shrdWorkload)); - - ASSERT_TRUE(m.isBusy()); - - m.tick(); - - ASSERT_TRUE(m.isBusy()); - - m.tick(); - - ASSERT_FALSE(m.isBusy()); -} \ No newline at end of file diff --git a/Testing/include/modeling/RackTest.h b/Testing/include/modeling/RackTest.h deleted file mode 100644 index cd568e14..00000000 --- a/Testing/include/modeling/RackTest.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "modeling\Rack.h" - -#include - -TEST(RackTest, ConstructorTest) -{ - Modeling::Rack rack(10, 100); - ASSERT_EQ(rack.id, 10); -} - -TEST(RackTest, GetSetMachines) -{ - Modeling::Rack rack(10, 100); - - Modeling::Machine machine(100); - rack.setMachine(machine, 10); - - ASSERT_EQ(rack.getMachines().size(), 1); - ASSERT_EQ(rack.getMachines().at(0).get().getSpeed(), 100); -} diff --git a/Testing/include/modeling/RoomTest.h b/Testing/include/modeling/RoomTest.h deleted file mode 100644 index 6d482e73..00000000 --- a/Testing/include/modeling/RoomTest.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include "modeling\Room.h" - -#include - -TEST(RoomTest, ConstructorTest) -{ - Modeling::Room room(10); - ASSERT_EQ(room.id, 10); -} - -TEST(RoomTest, GetSetEntities) -{ - Modeling::Room room(10); - - int first = 3; - room.addEntity(first); - - double second = 4.0; - room.addEntity(second); - - ASSERT_EQ(room.getEntitiesOfType().at(0), 3); - ASSERT_EQ(room.getEntitiesOfType().at(0), 4.0); -} diff --git a/Testing/include/modeling/TypeIndexTest.h b/Testing/include/modeling/TypeIndexTest.h deleted file mode 100644 index 0a0d6d54..00000000 --- a/Testing/include/modeling/TypeIndexTest.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include "modeling\TypeIndex.h" - -#include - -TEST(TypeIndexTest, SingleType) -{ - size_t index = indexOfType(); - ASSERT_EQ(index, 0); -} - -TEST(TypeIndexTest, MultipleTypesFirst) -{ - size_t index = indexOfType(); - ASSERT_EQ(index, 0); -} - -TEST(TypeIndexTest, MultipleTypesMiddle) -{ - size_t index = indexOfType(); - ASSERT_EQ(index, 1); -} - -TEST(TypeIndexTest, MultipleTypesLast) -{ - size_t index = indexOfType(); - ASSERT_EQ(index, 2); -} \ No newline at end of file diff --git a/Testing/include/simulation/SimulationHistoryTest.h b/Testing/include/simulation/SimulationHistoryTest.h deleted file mode 100644 index d519de89..00000000 --- a/Testing/include/simulation/SimulationHistoryTest.h +++ /dev/null @@ -1,48 +0,0 @@ -#pragma once -#include "simulation\SimulationHistory.h" -#include "simulation\workloads\WorkloadHistory.h" - -#include - -TEST(SimulationHistoryTest, SetGetHistoryAtTick) -{ - Simulation::SimulationHistory simulationHistory; - Simulation::WorkloadHistory workloadHistory; - workloadHistory.setFlopsDone(1, 100); - - simulationHistory.setHistoryAtTick(1, workloadHistory); - - auto resultHistory = simulationHistory.getHistoryAtTick(1); - ASSERT_EQ(resultHistory.history.at(0).first, 1); - ASSERT_EQ(resultHistory.history.at(0).second, 100); -} - -TEST(SimulationHistoryTest, ClearHistory) -{ - Simulation::SimulationHistory simulationHistory; - Simulation::WorkloadHistory workloadHistory; - simulationHistory.setHistoryAtTick(1, workloadHistory); - - ASSERT_EQ(simulationHistory.workloadHistories.size(), 1); - - simulationHistory.clearHistory(); - - ASSERT_EQ(simulationHistory.workloadHistories.size(), 0); -} - -TEST(SimulationHistoryTest, GetHistorySize) -{ - Simulation::SimulationHistory simulationHistory; - Simulation::WorkloadHistory workloadHistory; - simulationHistory.setHistoryAtTick(1, workloadHistory); - - ASSERT_EQ(simulationHistory.getHistorySize(), 1); - - simulationHistory.setHistoryAtTick(2, workloadHistory); - - ASSERT_EQ(simulationHistory.getHistorySize(), 2); - - simulationHistory.clearHistory(); - - ASSERT_EQ(simulationHistory.getHistorySize(), 0); -} \ No newline at end of file diff --git a/Testing/include/simulation/workloads/SimpleSchedulerTest.h b/Testing/include/simulation/workloads/SimpleSchedulerTest.h deleted file mode 100644 index 07b4416f..00000000 --- a/Testing/include/simulation/workloads/SimpleSchedulerTest.h +++ /dev/null @@ -1,106 +0,0 @@ -#pragma once -#include "simulation\workloads\SimpleScheduler.h" -#include "simulation\workloads\Workload.h" -#include "modeling\Machine.h" - -#include -#include - -TEST(SimpleSchedulerTest, ScheduleSingleMachine) -{ - // Initialization - Simulation::SimpleScheduler scheduler; - Simulation::Workload workload1(100, 0, 1, 1, 0); - Simulation::Workload workload2(150, 0, 1, 1, 0); - Modeling::Machine machine(10); - - std::vector> machines; - machines.push_back(std::reference_wrapper(machine)); - scheduler.addWorkload(workload1); - scheduler.addWorkload(workload2); - - // Distribute tasks across machines - scheduler.schedule(machines); - - // Do work - for (auto machine : machines) - machine.get().tick(); - - // Assert work done - auto workloads = scheduler.getWorkloads(); - auto workload1Remaining = workloads.at(0).lock()->getRemainingOperations(); - auto workload2Remaining = workloads.at(1).lock()->getRemainingOperations(); - ASSERT_EQ(workload1Remaining, 90); - ASSERT_EQ(workload2Remaining, 150); -} - -TEST(SimpleSchedulerTest, ScheduleMultipleMachine) -{ - // Initialization - Simulation::SimpleScheduler scheduler; - Simulation::Workload workload1(100, 0, 1, 1, 0); - Simulation::Workload workload2(150, 0, 1, 1, 0); - Modeling::Machine machine1(10); - Modeling::Machine machine2(30); - - std::vector> machines; - machines.push_back(std::reference_wrapper(machine1)); - machines.push_back(std::reference_wrapper(machine2)); - scheduler.addWorkload(workload1); - scheduler.addWorkload(workload2); - - // Distribute tasks across machines - scheduler.schedule(machines); - - // Do work - for (auto machine : machines) - machine.get().tick(); - - // Assert work done - auto workloads = scheduler.getWorkloads(); - auto workload1Remaining = workloads.at(0).lock()->getRemainingOperations(); - auto workload2Remaining = workloads.at(1).lock()->getRemainingOperations(); - ASSERT_EQ(workload1Remaining, 60); - ASSERT_EQ(workload2Remaining, 150); -} - -TEST(SimpleSchedulerTest, ScheduleFinishTask) -{ - // Initialization - Simulation::SimpleScheduler scheduler; - Simulation::Workload workload1(100, 0, 1, 1, 0); - Modeling::Machine machine1(100); - - std::vector> machines; - machines.push_back(std::reference_wrapper(machine1)); - scheduler.addWorkload(workload1); - ASSERT_TRUE(scheduler.hasWorkloads()); - - // Distribute tasks across machines - scheduler.schedule(machines); - - // Do work - for (auto machine : machines) - machine.get().tick(); - - // Distribute tasks across machines again, this is when finished workloads get cleared - scheduler.schedule(machines); - - // Assert work done - auto workloads = scheduler.getWorkloads(); - ASSERT_EQ(workloads.size(), 0); - ASSERT_FALSE(scheduler.hasWorkloads()); -} - -TEST(SimpleSchedulerTest, AddMultipleWorkloads) -{ - Simulation::SimpleScheduler ss; - std::vector workloads{ - Simulation::Workload(100, 0, 1, 1, 0), - Simulation::Workload(100, 0, 1, 1, 0) - }; - ss.addWorkloads(workloads); - - ASSERT_TRUE(ss.hasWorkloads()); - ASSERT_EQ(ss.getWorkloads().size(), 2); -} \ No newline at end of file diff --git a/Testing/include/simulation/workloads/WorkloadHistoryTest.h b/Testing/include/simulation/workloads/WorkloadHistoryTest.h deleted file mode 100644 index 4cf7f4e3..00000000 --- a/Testing/include/simulation/workloads/WorkloadHistoryTest.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -#include "simulation\workloads\WorkloadHistory.h" - -#include - -TEST(WorkloadHistoryTest, SetFlopsDone) -{ - Simulation::WorkloadHistory history; - history.setFlopsDone(1, 5); - - auto a = history.history.at(0); - - ASSERT_EQ(a.first, 1); - ASSERT_EQ(a.second, 5); -} \ No newline at end of file diff --git a/Testing/include/simulation/workloads/WorkloadTest.h b/Testing/include/simulation/workloads/WorkloadTest.h deleted file mode 100644 index e0da2138..00000000 --- a/Testing/include/simulation/workloads/WorkloadTest.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -#include "simulation\workloads\Workload.h" - -#include - -TEST(WorkloadTest, Constructor) -{ - Simulation::Workload w(100, 0, 5, 3, 0); - ASSERT_EQ(false, w.isFinished()); - ASSERT_EQ(5, w.getId()); - ASSERT_EQ(100, w.getRemainingOperations()); - ASSERT_EQ(100, w.getTotalOperations()); -} - -TEST(WorkloadTest, DoOperations) -{ - Simulation::Workload w(100, 0, 5, 3, 0); - w.doOperations(10); - ASSERT_EQ(90, w.getRemainingOperations()); -} - -TEST(WorkloadTest, GetTotalOperations) -{ - Simulation::Workload w(100, 0, 5, 3, 0); - w.doOperations(10); - ASSERT_EQ(100, w.getTotalOperations()); -} - -TEST(WorkloadTest, IsFinished) -{ - Simulation::Workload w(10, 0, 5, 3, 0); - w.doOperations(10); - ASSERT_EQ(true, w.isFinished()); -} diff --git a/Testing/src/main.cpp b/Testing/src/main.cpp deleted file mode 100644 index 6c31e43a..00000000 --- a/Testing/src/main.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "simulation\workloads\WorkloadTest.h" -#include "simulation\workloads\WorkloadHistoryTest.h" -#include "simulation\workloads\SimpleSchedulerTest.h" -#include "simulation\SimulationHistoryTest.h" -#include "modeling\TypeIndexTest.h" -#include "modeling\MachineTest.h" -#include "modeling\EntityTest.h" -#include "modeling\DatacenterTest.h" -#include "modeling\RackTest.h" -#include "modeling\RoomTest.h" - -#include - -int main(int ac, char* av[]) -{ - testing::InitGoogleTest(&ac, av); - int rc = RUN_ALL_TESTS(); - std::cin.get(); - return rc; -} - -- cgit v1.2.3