diff --git a/src/main/java/mvd/jester/ResultCollector.java b/src/main/java/mvd/jester/ResultCollector.java index 00d27db..c7672d8 100644 --- a/src/main/java/mvd/jester/ResultCollector.java +++ b/src/main/java/mvd/jester/ResultCollector.java @@ -35,18 +35,18 @@ public class ResultCollector { public void logAll() { if (!testResults.isEmpty()) { - logResults(testResults, "test"); - logMeanTardiness(simulatorResults, "test"); + logFeasibility(testResults, "test"); + logTardinessStatistics(simulatorResults, "test"); logFailedTardiness(testResults, "test"); } if (!simulatorResults.isEmpty()) { - logResults(simulatorResults, "sim"); - logMeanTardiness(simulatorResults, "sim"); + logFeasibility(simulatorResults, "sim"); + logTardinessStatistics(simulatorResults, "sim"); logFailedTardiness(simulatorResults, "sim"); } } - public void logResults( + public void logFeasibility( Table, Set> results, String type) { LocalTime date = LocalTime.now(); Logger log = new Logger("./results/results_" + type + "_" + numberOfProcessors + "_" @@ -117,11 +117,11 @@ public class ResultCollector { log.finalize(); } - public void logMeanTardiness( + public void logTardinessStatistics( Table, Set> results, String type) { LocalTime date = LocalTime.now(); - Logger log = new Logger("./results/mean_tardiness_" + type + "_" + numberOfProcessors + "_" - + date.getHour() + ":" + date.getMinute() + ".txt"); + Logger log = new Logger("./results/statistics_tardiness_" + type + "_" + numberOfProcessors + + "_" + date.getHour() + ":" + date.getMinute() + ".txt"); String firstLine = new String("Utilization\tTotal"); if (!results.isEmpty()) { @@ -136,7 +136,7 @@ public class ResultCollector { String.valueOf((double) kv / 10) + "\t" + totalNumberOfTasksets.get(kv); for (Pair pair : results.columnKeySet()) { Set simulationInfos = results.get(kv, pair); - List values = new ArrayList<>(); + List values = ArrayList<>(); for (SchedulingInfo s : simulationInfos) { for (TerminationInfo t : s.getTerminationInfos()) {