diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-26 08:37:23 +0000 |
| commit | 78a48c46cf3727dd06179cb1360b2f9057647042 (patch) | |
| tree | 01f418fab8ee1cd61c5a6a891bdce09cde142098 /test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala | |
| parent | 78007ac467c9d6e88ae183a9126772829072704c (diff) | |
| download | scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.gz scala-78a48c46cf3727dd06179cb1360b2f9057647042.tar.bz2 scala-78a48c46cf3727dd06179cb1360b2f9057647042.zip | |
Merge branch 'work'
Conflicts:
src/library/scala/concurrent/SyncVar.scala
Diffstat (limited to 'test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala')
| -rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala index 81d4f095da..3976b72d1a 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/ParallelHashTries.scala @@ -135,6 +135,9 @@ object RefParHashTrieBenches extends ParHashTrieBenches[Dummy, Dummy] { a.num = a.in % 2 (a, p._2) } + val flatmapper = (p: DPair) => { + List(p, p, p, p, p) + } override val mapper2 = (p: DPair) => { val a = 1 //heavy(p._1.in) (new Dummy(p._1.in * -2 + a), p._2) |