diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java index 4f0bed3365cb2dc1fd08a856588365c88eb69df8..8c27191fd4d91abd170e1a2113daa0f7ed43725d 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java @@ -8,14 +8,15 @@ import java.util.Collection; import java.util.DoubleSummaryStatistics; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.collect.Streams; public class ResultFileTask { - private String name; - private List<ResultFileJob> jobs; + private final String name; + private final List<ResultFileJob> jobs; private DoubleSummaryStatistics memoryUsageStats; private DoubleSummaryStatistics startTimeStats; private DoubleSummaryStatistics wallTimeStats; @@ -38,8 +39,8 @@ public class ResultFileTask { // Calculate start and wall time values DateTimeFormatter formatter = new DateTimeFormatterBuilder() - .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss z yyyy")) - .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss yyyy")).toFormatter(); + .appendOptional(DateTimeFormatter.ofPattern("EEE MMM d kk:mm:ss z yyyy")) + .appendOptional(DateTimeFormatter.ofPattern("EEE MMM d kk:mm:ss yyyy")).toFormatter(Locale.ENGLISH); Collection<Double> startTimeValues = retrieveValues(Constants.STATISTICS_RESOURCES_START_TIME) .map(s -> s != null && !s.equals("null") ? (double) LocalDateTime.parse(s, formatter).toEpochSecond(ZoneOffset.UTC) diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java index c1a9b3ec9e3c43591fbf2104239f491488a2f3d7..f781fcadd4a78afa5e97dda3e72b79609723f04b 100644 --- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java +++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java @@ -16,7 +16,7 @@ import com.google.common.collect.Streams; import cz.it4i.fiji.haas_java_client.JobState; import cz.it4i.fiji.haas_java_client.SynchronizableFileType; -//FIXME: TaskComputation 'done' should be Finished not Queued + public class TaskComputation { public static class Log { diff --git a/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java b/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java new file mode 100644 index 0000000000000000000000000000000000000000..0d7a7d74a93ab053ac2f7245aee95b8ae2e374d8 --- /dev/null +++ b/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java @@ -0,0 +1,21 @@ +package cz.it4i.fiji.haas; + +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.util.Locale; + +public class TestFormat { + public static void main(String[] args) { + System.out.println(Locale.getDefault()); + DateTimeFormatter formatter = new DateTimeFormatterBuilder() + .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss z yyyy")) + .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss yyyy")).toFormatter(); + + String value = "Thu Jun 14 09:08:43 2018"; + System.out.println(LocalDateTime.parse(value, formatter).toEpochSecond(ZoneOffset.UTC)); + + } + +}