diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java index 3f636d9312c94b5b4c084620c6a221dd1ecd8738..0d186a57f415328c50bf1df4b1837bd4fc7fcbf5 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java @@ -14,6 +14,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -206,6 +208,10 @@ public class BenchmarkJobManager { break; } scanner.close(); + + // Order tasks chronologically + List<String> chronologicList = Constants.STATISTICS_TASK_NAME_MAP.keySet().stream().collect(Collectors.toList()); + Collections.sort(tasks, Comparator.comparingInt(task -> chronologicList.indexOf(task.getDescription()))); } private void setDownloaded(boolean b) { diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java index 2dcdc852be4c5132da36037174118f856e30e3e9..9ecfeb47fe8183f8c78e75466f97ce1cd173ba26 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java @@ -1,6 +1,6 @@ package cz.it4i.fiji.haas_spim_benchmark.core; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; public interface Constants { @@ -22,7 +22,7 @@ public interface Constants { String STATISTICS_RESOURCES_WALL_TIME = "resources_used.walltime"; String STATISTICS_RESOURCES_CPU_PERCENTAGE = "resources_used.cpupercent"; - Map<String, String> STATISTICS_TASK_NAME_MAP = new HashMap<String, String>() { + Map<String, String> STATISTICS_TASK_NAME_MAP = new LinkedHashMap<String, String>() { private static final long serialVersionUID = 1L; { put("define_xml_tif", "Define dataset"); @@ -36,6 +36,7 @@ public interface Constants { put("define_output", "Define output"); put("hdf5_xml_output", "Define hdf5 output"); put("resave_hdf5_output", "Resave output to hdf5"); + put("done", "Done"); }}; String STATISTICS_SUMMARY_FILENAME = "summary.csv"; }