formatStatistics: moving constants into a special file; refactoring

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java

@@ -261,7 +261,7 @@ public class BenchmarkJobManager {
 					for (int i = 1; i < columns.length; i++) {
 						values.add(new ResultFileJob(columns[i]));
 					}
-				} else if (!columns[0].equals("jobs #")){
+				} else if (!columns[0].equals("jobs #")) {
 					for (int i = 1; i < columns.length; i++) {
 						ResultFileJob resultFileJob;
 						resultFileJob = values.get(i - 1);

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Constants.java

@@ -11,4 +11,8 @@ public interface Constants {
 	String SPIM_OUTPUT_FILENAME_PATTERN = "spim.outputFilenamePattern";
 	String CONFIG_YAML = "config.yaml";
 	String BENCHMARK_RESULT_FILE = "benchmark_result.csv";
+	
+	String STATISTICS_RESOURCES_MEMORY_USAGE = "resources_used.mem";
+	String STATISTICS_RESOURCES_WALL_TIME = "resources_used.walltime";
+	String STATISTICS_RESOURCES_CPU_PERCENTAGE = "resources_used.cpupercent";
 }

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileJob.java

@@ -9,7 +9,6 @@ public class ResultFileJob {
 
 	public ResultFileJob(String id) {
 		this.id = id;
-
 	}
 
 	public String getValue(String key) {

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java

 package cz.it4i.fiji.haas_spim_benchmark.core;
 
 import java.util.LinkedList;
-import java.util.function.Function;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 public class ResultFileTask {
@@ -19,23 +17,20 @@ public class ResultFileTask {
 	}
 
 	public double getAverageMemoryUsage() {
-		return getAverage(str->Double.parseDouble(str), Collectors.averagingDouble(d->d),"resources_used.mem").doubleValue();
+		return getAverage(Constants.STATISTICS_RESOURCES_MEMORY_USAGE);
 	}
 
 	public double getAverageWallTime() {
-		return getAverage("resources_used.walltime");
+		return getAverage(Constants.STATISTICS_RESOURCES_WALL_TIME);
 	}
 
 	public double getAverageCpuPercentage() {
-		return getAverage("resources_used.cpupercent");
-	}
-
-	private double getAverage(String propertyName) {
-		return getAverage(str->Integer.parseInt(str), Collectors.averagingInt(i->i),propertyName).doubleValue();
+		return getAverage(Constants.STATISTICS_RESOURCES_CPU_PERCENTAGE);
 	}
 	
-	private<T> Double getAverage(Function<String, T> valueProvider,Collector<T,?,Double> collector,String propertyName) {
-		return jobs.stream().map(job -> job.getValue(propertyName)).map(memStr -> valueProvider.apply(memStr))
-				.collect(collector);
+	private Double getAverage(String propertyName) {
+		return jobs.stream().map(job -> job.getValue(propertyName))
+				.map(memStr -> Double.parseDouble(memStr))
+				.collect(Collectors.averagingDouble(d->d)).doubleValue();
 	}
 }
\ No newline at end of file