2 files changed, 34 insertions, 7 deletions
diff --git a/Simulator/include/simulation/schedulers/FirstInFirstOutScheduler.h b/Simulator/include/simulation/schedulers/FirstInFirstOutScheduler.h
index 797eb489..5d277c8d 100644
--- a/Simulator/include/simulation/schedulers/FirstInFirstOutScheduler.h
+++ b/Simulator/include/simulation/schedulers/FirstInFirstOutScheduler.h
@@ -22,8 +22,10 @@ namespace Simulation
 
 			// Find the first workload with dependencies finished
 			int index = 0;
-			while(!workloads.at(index)->dependencyFinished)
-				index = (++index) % workloads.size();
+
+			std::remove_if(workloads.begin(), workloads.end(), [](Workload* workload) {
+				return !workload->dependencyFinished;
+			});
 
 			// Reset the number of cores used for each workload
 			for (auto workload : workloads) 
@@ -38,6 +40,19 @@ namespace Simulation
 				workloads.at(index)->setCoresUsed(
 					workloads.at(index)->getCoresUsed() + machine.get().getNumberOfCores()
 				);
+
+				if (!workloads.at(index)->isParallelizable())
+				{
+					workloads.erase(workloads.begin() + index);
+					if (workloads.size() == 0)
+						break;
+
+					index %= workloads.size();
+				}
+				else
+				{
+					index = (++index) % workloads.size();
+				}
 			}
 		}
 	};
diff --git a/Simulator/include/simulation/schedulers/ShortestRemainingTimeScheduler.h b/Simulator/include/simulation/schedulers/ShortestRemainingTimeScheduler.h
index 51673fb5..a152c39b 100644
--- a/Simulator/include/simulation/schedulers/ShortestRemainingTimeScheduler.h
+++ b/Simulator/include/simulation/schedulers/ShortestRemainingTimeScheduler.h
@@ -20,6 +20,10 @@ namespace Simulation
 			if (workloads.size() == 0)
 				return;
 
+			std::remove_if(workloads.begin(), workloads.end(), [](Workload* workload) {
+				return !workload->dependencyFinished;
+			});
+
 			for (auto workload : workloads)
 			{
 				workload->setCoresUsed(0);
@@ -34,18 +38,26 @@ namespace Simulation
 			);
 
 			int taskIndex = 0;
-
 			for (auto machine : machines)
 			{
-				while (!workloads.at(taskIndex)->dependencyFinished)
-					taskIndex = (++taskIndex) % workloads.size();
-
 				machine.get().giveTask(workloads.at(taskIndex));
+ 
 				workloads.at(taskIndex)->setCoresUsed(
 					workloads.at(taskIndex)->getCoresUsed() + machine.get().getNumberOfCores()
 				);
 
-				taskIndex = (++taskIndex) % workloads.size();
+				if (!workloads.at(taskIndex)->isParallelizable())
+				{
+					workloads.erase(workloads.begin() + taskIndex);
+					if (workloads.size() == 0)
+						break;
+
+					taskIndex %= workloads.size();
+				}
+				else
+				{
+					taskIndex = (++taskIndex) % workloads.size();
+				}
 			}
 		}
 	};