summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRory Graves <rory.graves@fieldmark.co.uk>2017-03-04 07:45:03 +0100
committerRory Graves <rory.graves@fieldmark.co.uk>2017-03-04 08:05:41 +0100
commitfad8b95335f615ae0b6c4bb79f21304ff70d061e (patch)
tree45dd49de66f08036dda9050d306fd95c494eb0d6 /test
parentf77139532d5b6030eaa69a6ff9ed07e7ea4a4dfe (diff)
downloadscala-fad8b95335f615ae0b6c4bb79f21304ff70d061e.tar.gz
scala-fad8b95335f615ae0b6c4bb79f21304ff70d061e.tar.bz2
scala-fad8b95335f615ae0b6c4bb79f21304ff70d061e.zip
Fix compile error on existing ListBenchmark
Diffstat (limited to 'test')
-rw-r--r--test/benchmarks/src/main/scala/scala/collection/immutable/ListBenchmark.scala10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/benchmarks/src/main/scala/scala/collection/immutable/ListBenchmark.scala b/test/benchmarks/src/main/scala/scala/collection/immutable/ListBenchmark.scala
index 94844dcae2..36e2518993 100644
--- a/test/benchmarks/src/main/scala/scala/collection/immutable/ListBenchmark.scala
+++ b/test/benchmarks/src/main/scala/scala/collection/immutable/ListBenchmark.scala
@@ -23,12 +23,14 @@ class ListBenchmark {
var values: List[Content] = _
var mid: Content = _
var last: Content = _
+ var replacement: Content = _
@Setup(Level.Trial) def initKeys(): Unit = {
values = List.tabulate(size)(v => Content(v))
mid = Content(size / 2)
last = Content(Math.max(0,size -1))
+ replacement = Content(size * 2 + 1)
}
@Benchmark def filter_includeAll: Any = {
@@ -55,18 +57,14 @@ class ListBenchmark {
values.filter(v => v.value == last.value)
}
- @Setup(Level.Trial) def initKeys(): Unit = {
- values = List.tabulate(size)(n => if (n == size / 2) "mid" else "")
- }
-
@Benchmark def mapConserve_identity: Any = {
values.mapConserve(x => x)
}
@Benchmark def mapConserve_modifyAll: Any = {
- values.mapConserve(x => "replace")
+ values.mapConserve(x => replacement)
}
@Benchmark def mapConserve_modifyMid: Any = {
- values.mapConserve(x => if (x == "mid") "replace" else x)
+ values.mapConserve(x => if (x == mid) replacement else x)
}
}