diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-12 08:33:52 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-12 08:33:52 +0000 |
commit | 7ecee9ad1a14bed1761acc4ef2ee2fe660a0833b (patch) | |
tree | c98fd637bf3d786ad47559997bb64a11d60f7cbf /test/benchmarks/src | |
parent | 2263afdf115a9a499762ff60fa876c77eccfabc8 (diff) | |
download | scala-7ecee9ad1a14bed1761acc4ef2ee2fe660a0833b.tar.gz scala-7ecee9ad1a14bed1761acc4ef2ee2fe660a0833b.tar.bz2 scala-7ecee9ad1a14bed1761acc4ef2ee2fe660a0833b.zip |
Merge branch 'work'
Diffstat (limited to 'test/benchmarks/src')
-rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/misc/Loader.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/misc/Loader.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/misc/Loader.scala index 2a9fc2c3ef..1b73f2b868 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/misc/Loader.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/misc/Loader.scala @@ -30,15 +30,17 @@ class Loader(val size: Int, val parallelism: Int, val runWhat: String) extends B reset + val wa = Dictionary.wordarray ++ Dictionary.wordarray ++ Dictionary.wordarray + def runseq { val m = Map( '2' -> "ABC", '3' -> "DEF", '4' -> "GHI", '5' -> "JKL", '6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ" ) val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit - def wordCode(word: String): String = word.toUpperCase map charCode + def wordCode(word: String): String = (word.toUpperCase.toList map charCode).toString - Dictionary.wordarray groupBy wordCode + wa groupBy wordCode } def runpar { @@ -47,9 +49,9 @@ class Loader(val size: Int, val parallelism: Int, val runWhat: String) extends B '6' -> "MNO", '7' -> "PQRS", '8' -> "TUV", '9' -> "WXYZ" ) val charCode: Map[Char, Char] = for ((digit, letters) <- m; letter <- letters) yield letter -> digit - def wordCode(word: String): String = word.toUpperCase map charCode + def wordCode(word: String): String = (word.toUpperCase.toList map charCode).toString - Dictionary.wordarray.par groupBy wordCode + wa.par groupBy wordCode } def reset = runWhat match { |