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 51f57f4cf36059b273d1ab388d1e95dfb8057764..c08c18d07ec090a9d02ebfc908960a1b11f6f41c 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 @@ -287,7 +287,7 @@ public class BenchmarkJobManager { } for (ResultFileTask task : identifiedTasks) { - Object[] args = {task.name, task.getJobCount(), task.getAverageMemoryUsage()}; + Object[] args = {Constants.STATISTICS_TASK_NAME_MAP.get(task.name), task.getJobCount(), task.getAverageMemoryUsage()}; MessageFormat fmt = new MessageFormat(Constants.STATISTICS_OUTPUT_MESSAGE); System.out.println(fmt.format(args)); } 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 c5916d289e8586f8078dc40e5d054a58e93ec070..0e4f436ca65c9eb2174a0d2d91496394c1bf2248 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,5 +1,8 @@ package cz.it4i.fiji.haas_spim_benchmark.core; +import java.util.HashMap; +import java.util.Map; + public interface Constants { long HAAS_UPDATE_TIMEOUT = 1000; String HAAS_JOB_NAME = "HaaSSPIMBenchmark"; @@ -19,5 +22,20 @@ public interface Constants { String STATISTICS_RESOURCES_WALL_TIME = "resources_used.walltime"; String STATISTICS_RESOURCES_CPU_PERCENTAGE = "resources_used.cpupercent"; - String STATISTICS_OUTPUT_MESSAGE = "Task {0} needed {1} {1,choice,0#jobs|1#job|1<jobs} and {2} MB of memory in average."; + Map<String, String> STATISTICS_TASK_NAME_MAP = new HashMap<String, String>() { + private static final long serialVersionUID = 1L; + { + put("define_xml_tif", "Define dataset"); + put("hdf5_xml", "Define hdf5 dataset"); + put("resave_hdf5", "Resave to hdf5"); + put("registration", "Detection and registration"); + put("xml_merge", "Merge xml"); + put("timelapse", "Time lapse registration"); + put("fusion", "Average fusion"); + put("deconvolution", "Deconvolution GPU"); + put("define_output", "Define output"); + put("hdf5_xml_output", "Define hdf5 output"); + put("resave_hdf5_output", "Resave output to hdf5"); + }}; + String STATISTICS_OUTPUT_MESSAGE = "{0} needed {1} {1,choice,0#jobs|1#job|1<jobs} and {2} MB of memory in average."; }