diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-06-15 16:15:47 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-06-15 16:15:47 +0000 |
commit | de7fbb051b280f794cb8d706414191e4d5d08bf9 (patch) | |
tree | 48c371343aadbcd964bcb01adde7fa8dc7b6972e /test | |
parent | bf1b8d136d862e5e4d5a6bba3c05254327542281 (diff) | |
download | scala-de7fbb051b280f794cb8d706414191e4d5d08bf9.tar.gz scala-de7fbb051b280f794cb8d706414191e4d5d08bf9.tar.bz2 scala-de7fbb051b280f794cb8d706414191e4d5d08bf9.zip |
Adding primary version of parallel hash tries.
No review.
Diffstat (limited to 'test')
-rw-r--r-- | test/benchmarks/src/scala/collection/parallel/Benchmarking.scala | 1 | ||||
-rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala index f6aa63cb1a..c52724757a 100644 --- a/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala +++ b/test/benchmarks/src/scala/collection/parallel/Benchmarking.scala @@ -93,6 +93,7 @@ trait BenchmarkRegister { register(hashtries.Construct) register(hashtries.Lookup) register(hashtries.Combine) + register(hashtries.MultipleCombine) } diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala index f04688c7f9..16f791a710 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/hashtries/Combine.scala @@ -22,13 +22,22 @@ class Combine(val size: Int, val parallelism: Int, val runWhat: String) extends def runseq = runhashtrie def runhashtrie = { hashtrie combine thattrie + // println + // println("both tries: " + HashTrie.bothtries) + // println("one trie, one item: " + HashTrie.onetrie) + // println("both single: " + HashTrie.bothsingle) + // System exit 1 + } + def rundestructive = { + hashtrie combine thattrie } def runappendtrie = hashtrie ++ thattrie def runhashmap = hashmap ++ thatmap def companion = Combine - def comparisonMap = Map("hashtrie" -> runhashtrie _, "hashmap" -> runhashmap _, "appendtrie" -> runappendtrie _) + def comparisonMap = Map("hashtrie" -> runhashtrie _, "hashmap" -> runhashmap _, "destruct" -> rundestructive _, "appendtrie" -> runappendtrie _) override def reset = runWhat match { case "appendtrie" => initHashTrie + case "destruct" => initHashTrie case _ => super.reset } } |