summaryrefslogtreecommitdiff
path: root/test/files/run/t5293-map.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-18 00:09:46 -0700
committerPaul Phillips <paulp@improving.org>2013-09-18 07:13:38 -0700
commitf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (patch)
tree174861715807c23ba332f78769a9f7e1377b7f02 /test/files/run/t5293-map.scala
parentd45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (diff)
downloadscala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.gz
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.bz2
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.zip
Cull extraneous whitespace.
One last flurry with the broom before I leave you slobs to code in your own filth. Eliminated all the trailing whitespace I could manage, with special prejudice reserved for the test cases which depended on the preservation of trailing whitespace. Was reminded I cannot figure out how to eliminate the trailing space on the "scala> " prompt in repl transcripts. At least reduced the number of such empty prompts by trimming transcript code on the way in. Routed ConsoleReporter's "printMessage" through a trailing whitespace stripping method which might help futureproof against the future of whitespace diseases. Deleted the up-to-40 lines of trailing whitespace found in various library files. It seems like only yesterday we performed whitespace surgery on the whole repo. Clearly it doesn't stick very well. I suggest it would work better to enforce a few requirements on the way in.
Diffstat (limited to 'test/files/run/t5293-map.scala')
-rw-r--r--test/files/run/t5293-map.scala30
1 files changed, 15 insertions, 15 deletions
diff --git a/test/files/run/t5293-map.scala b/test/files/run/t5293-map.scala
index 2707aed07e..ad1bbcfe30 100644
--- a/test/files/run/t5293-map.scala
+++ b/test/files/run/t5293-map.scala
@@ -6,7 +6,7 @@ import scala.collection.JavaConverters._
object Test extends App {
-
+
def bench(label: String)(body: => Unit): Long = {
val start = System.nanoTime
@@ -15,14 +15,14 @@ object Test extends App {
val end = System.nanoTime
//println("%s: %s ms".format(label, (end - start) / 1000.0 / 1000.0))
-
+
end - start
}
-
+
def benchJava(values: java.util.Map[Int, Int]) = {
bench("Java Map") {
val m = new java.util.HashMap[Int, Int]
-
+
m.putAll(values)
}
}
@@ -30,33 +30,33 @@ object Test extends App {
def benchScala(values: Iterable[(Int, Int)]) = {
bench("Scala Map") {
val m = new scala.collection.mutable.HashMap[Int, Int]
-
+
m ++= values
}
}
-
+
def benchScalaSorted(values: Iterable[(Int, Int)]) = {
bench("Scala Map sorted") {
val m = new scala.collection.mutable.HashMap[Int, Int]
-
+
m ++= values.toArray.sorted
}
}
-
+
def benchScalaPar(values: Iterable[(Int, Int)]) = {
bench("Scala ParMap") {
val m = new scala.collection.parallel.mutable.ParHashMap[Int, Int] map { x => x }
-
+
m ++= values
}
}
-
+
val total = 50000
val values = (0 until total) zip (0 until total)
val map = scala.collection.mutable.HashMap.empty[Int, Int]
-
+
map ++= values
-
+
// warmup
for (x <- 0 until 5) {
benchJava(map.asJava)
@@ -66,15 +66,15 @@ object Test extends App {
benchScala(map)
benchScalaPar(map)
}
-
+
val javamap = benchJava(map.asJava)
val scalamap = benchScala(map)
val scalaparmap = benchScalaPar(map)
-
+
// println(javamap)
// println(scalamap)
// println(scalaparmap)
-
+
assert(scalamap < (javamap * 10), "scalamap: " + scalamap + " vs. javamap: " + javamap)
assert(scalaparmap < (javamap * 10), "scalaparmap: " + scalaparmap + " vs. javamap: " + javamap)
}