diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-28 12:09:49 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-28 12:09:49 +0000 |
commit | f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7 (patch) | |
tree | 2a5770c3ca5f08410dd197035e3bae7a0b52ba23 /test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala | |
parent | 4ddb4ce1e28afe15f9335a4bd51e07f68161b27c (diff) | |
download | scala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.tar.gz scala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.tar.bz2 scala-f388aaaf52dab4ceaf8e5f26c72eb4a0d1d3b3e7.zip |
Mostly refactored existing test functionality f...
Mostly refactored existing test functionality for parallel collections.
Added immutable hash set tests.
No review.
Diffstat (limited to 'test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala')
-rw-r--r-- | test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala b/test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala index 51c35140dd..5278d28f0f 100644 --- a/test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala +++ b/test/files/scalacheck/parallel-collections/ParallelHashMapCheck.scala @@ -1,5 +1,5 @@ package scala.collection.parallel -package immutable +package mutable @@ -14,7 +14,7 @@ import scala.collection._ import scala.collection.parallel.ops._ -abstract class ParallelHashMapCheck[K, V](tp: String) extends ParallelMapCheck[K, V]("immutable.ParHashMap[" + tp + "]") { +abstract class ParallelHashMapCheck[K, V](tp: String) extends ParallelMapCheck[K, V]("mutable.ParHashMap[" + tp + "]") { ForkJoinTasks.defaultForkJoinPool.setMaximumPoolSize(Runtime.getRuntime.availableProcessors * 2) ForkJoinTasks.defaultForkJoinPool.setParallelism(Runtime.getRuntime.availableProcessors * 2) @@ -24,15 +24,15 @@ abstract class ParallelHashMapCheck[K, V](tp: String) extends ParallelMapCheck[K def hasStrictOrder = false - def instances(vals: Seq[Gen[(K, V)]]): Gen[Iterable[(K, V)]] = sized { sz => - var hm = new immutable.HashMap[K, V] + def ofSize(vals: Seq[Gen[(K, V)]], sz: Int) = { + val hm = new mutable.HashMap[K, V] val gen = vals(rnd.nextInt(vals.size)) for (i <- 0 until sz) hm += sample(gen) hm } def fromTraversable(t: Traversable[(K, V)]) = { - var phm = new ParHashMap[K, V] + val phm = new ParHashMap[K, V] var i = 0 for (kv <- t.toList) { phm += kv @@ -58,7 +58,7 @@ with PairValues[Int, Int] override def printDataStructureDebugInfo(ds: AnyRef) = ds match { case pm: ParHashMap[k, v] => - pm.printDebugInfo + println("Mutable parallel hash map") case _ => println("could not match data structure type: " + ds.getClass) } |