From 1aa785ebae0a73587a241e009e36e2c777ee3bd6 Mon Sep 17 00:00:00 2001
From: Jan Kozusznik <jan@kozusznik.cz>
Date: Thu, 1 Feb 2018 13:02:29 +0100
Subject: [PATCH] introduce constants, organize imports

---
 .../core/BenchmarkJobManager.java                | 16 +++++++++++-----
 .../fiji/haas_spim_benchmark/core/Constants.java |  4 +++-
 .../ui/SPIMPipelineProgressViewController.java   |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

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 a1bee6b8..54e47a72 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
@@ -1,5 +1,11 @@
 package cz.it4i.fiji.haas_spim_benchmark.core;
 
+import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.BENCHMARK_RESULT_FILE;
+import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.HAAS_UPDATE_TIMEOUT;
+import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.SPIM_OUTPUT_FILENAME_PATTERN;
+import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.STATISTICS_TASK_NAME_MAP;
+import static cz.it4i.fiji.haas_spim_benchmark.core.Constants.UI_TO_HAAS_FREQUENCY_UPDATE_RATIO;
+
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
@@ -75,14 +81,14 @@ public class BenchmarkJobManager {
 				};
 			};
 			
-			computationAccessor = new SPIMComputationAccessorDecoratorWithTimeout(computationAccessor, Constants.HAAS_UPDATE_TIMEOUT);
+			computationAccessor = new SPIMComputationAccessorDecoratorWithTimeout(computationAccessor, HAAS_UPDATE_TIMEOUT/UI_TO_HAAS_FREQUENCY_UPDATE_RATIO);
 		}
 
 		public void startJob(Progress progress) throws IOException {
 			job.uploadFilesByName(Arrays.asList(Constants.CONFIG_YAML), progress);
 			String outputName = getOutputName(job.openLocalFile(Constants.CONFIG_YAML));
 			job.submit();
-			job.setProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN, outputName);
+			job.setProperty(SPIM_OUTPUT_FILENAME_PATTERN, outputName);
 			setDownloaded(false);
 		}
 
@@ -92,7 +98,7 @@ public class BenchmarkJobManager {
 
 		public void downloadData(Progress progress) throws IOException {
 			if (job.getState() == JobState.Finished) {
-				String filePattern = job.getProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN);
+				String filePattern = job.getProperty(SPIM_OUTPUT_FILENAME_PATTERN);
 				job.download(downloadFinishedData(filePattern), progress);
 			} else if (job.getState() == JobState.Failed) {
 				job.download(downloadFailedData(), progress);
@@ -103,7 +109,7 @@ public class BenchmarkJobManager {
 
 		public void downloadStatistics(Progress progress) throws IOException {
 			job.download(BenchmarkJobManager.downloadStatistics(), progress);
-			Path resultFile = job.getDirectory().resolve(Constants.BENCHMARK_RESULT_FILE);
+			Path resultFile = job.getDirectory().resolve(BENCHMARK_RESULT_FILE);
 			if (resultFile != null)
 				BenchmarkJobManager.formatResultFile(resultFile);
 		}
@@ -192,7 +198,7 @@ public class BenchmarkJobManager {
 			scanner.close();
 			
 			// Order tasks chronologically
-			List<String> chronologicList = Constants.STATISTICS_TASK_NAME_MAP.keySet().stream().collect(Collectors.toList());
+			List<String> chronologicList = STATISTICS_TASK_NAME_MAP.keySet().stream().collect(Collectors.toList());
 			Collections.sort(tasks, Comparator.comparingInt(task -> chronologicList.indexOf(task.getDescription())));
 		}
 		
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 9ecfeb47..300159a1 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
@@ -4,7 +4,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public interface Constants {
-	long HAAS_UPDATE_TIMEOUT = 30000;
+	int HAAS_UPDATE_TIMEOUT = 30000;
+	short UI_TO_HAAS_FREQUENCY_UPDATE_RATIO = 10;
 	String HAAS_JOB_NAME = "HaaSSPIMBenchmark";
 	int HAAS_CLUSTER_NODE_TYPE = 6;
 	int HAAS_TEMPLATE_ID = 4;
@@ -39,4 +40,5 @@ public interface Constants {
 		put("done", "Done");
 	}};
 	String STATISTICS_SUMMARY_FILENAME = "summary.csv";
+	
 }
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/SPIMPipelineProgressViewController.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/SPIMPipelineProgressViewController.java
index ed3f50d7..1c9d27ab 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/SPIMPipelineProgressViewController.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/SPIMPipelineProgressViewController.java
@@ -91,7 +91,7 @@ public class SPIMPipelineProgressViewController implements FXFrame.Controller {
 				public void run() {
 					fillTable();
 				}
-			}, Constants.HAAS_UPDATE_TIMEOUT / 10);
+			}, Constants.HAAS_UPDATE_TIMEOUT / Constants.UI_TO_HAAS_FREQUENCY_UPDATE_RATIO);
 		} else {
 			List<TaskComputation> computations = tasks.stream().map(task -> task.getComputations())
 					.collect(Collectors.<List<TaskComputation>>maxBy((a, b) -> a.size() - b.size())).get();
-- 
GitLab