diff --git a/java-stream/pom.xml b/java-stream/pom.xml index 6a1e4f0..ffaee72 100644 --- a/java-stream/pom.xml +++ b/java-stream/pom.xml @@ -117,7 +117,7 @@ com.coveo fmt-maven-plugin - 2.11 + 2.9.1 diff --git a/java-stream/src/main/java/javastream/Main.java b/java-stream/src/main/java/javastream/Main.java index 4c8ed6c..32b67a4 100644 --- a/java-stream/src/main/java/javastream/Main.java +++ b/java-stream/src/main/java/javastream/Main.java @@ -1,8 +1,13 @@ package javastream; +import static javastream.FractionalMaths.divide; +import static javastream.FractionalMaths.from; +import static javastream.FractionalMaths.minus; +import static javastream.FractionalMaths.plus; +import static javastream.FractionalMaths.times; + import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; - import java.time.Duration; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Arrays; @@ -14,7 +19,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.function.Function; import java.util.stream.Collectors; - import javastream.JavaStream.Data; import javastream.JavaStream.Timings; import javastream.aparapi.AparapiStreams; @@ -22,12 +26,6 @@ import javastream.jdk.JdkStreams; import javastream.jdk.PlainStream; import javastream.tornadovm.TornadoVMStreams; -import static javastream.FractionalMaths.divide; -import static javastream.FractionalMaths.from; -import static javastream.FractionalMaths.minus; -import static javastream.FractionalMaths.plus; -import static javastream.FractionalMaths.times; - public class Main { enum Benchmark { diff --git a/java-stream/src/main/java/javastream/tornadovm/SpecialisedDouble.java b/java-stream/src/main/java/javastream/tornadovm/SpecialisedDouble.java index 065f00f..7712e31 100644 --- a/java-stream/src/main/java/javastream/tornadovm/SpecialisedDouble.java +++ b/java-stream/src/main/java/javastream/tornadovm/SpecialisedDouble.java @@ -1,7 +1,6 @@ package javastream.tornadovm; import java.util.Arrays; - import javastream.Main.Config; import uk.ac.manchester.tornado.api.annotations.Parallel; import uk.ac.manchester.tornado.api.annotations.Reduce;