diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-05 10:26:33 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-05 10:26:33 -0800 |
commit | b33adf47330b510d7d15971fa75aa11c7b9503ad (patch) | |
tree | b7e2546191b867a74eb840e6f9413770c631afd5 /test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala | |
parent | 92ec2cafb3333a710746a1a1bc1351000b2a3372 (diff) | |
parent | 344ac60c3f34cc0a1c6e6aae1479878fe63476eb (diff) | |
download | scala-b33adf47330b510d7d15971fa75aa11c7b9503ad.tar.gz scala-b33adf47330b510d7d15971fa75aa11c7b9503ad.tar.bz2 scala-b33adf47330b510d7d15971fa75aa11c7b9503ad.zip |
Merge pull request #3086 from axel22/topic/pc-execution-context
- parallel collections should use default ExecutionContext
Diffstat (limited to 'test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala')
-rw-r--r-- | test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala b/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala index 372d6b9fbd..f490d9490a 100644 --- a/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala +++ b/test/files/scalacheck/parallel-collections/ParallelRangeCheck.scala @@ -17,7 +17,7 @@ import scala.collection.parallel.ops._ -object ParallelRangeCheck extends ParallelSeqCheck[Int]("ParallelRange[Int]") with ops.IntSeqOperators { +class ParallelRangeCheck(val tasksupport: TaskSupport) extends ParallelSeqCheck[Int]("ParallelRange[Int]") with ops.IntSeqOperators { // ForkJoinTasks.defaultForkJoinPool.setMaximumPoolSize(Runtime.getRuntime.availableProcessors * 2) // ForkJoinTasks.defaultForkJoinPool.setParallelism(Runtime.getRuntime.availableProcessors * 2) @@ -38,9 +38,13 @@ object ParallelRangeCheck extends ParallelSeqCheck[Int]("ParallelRange[Int]") wi } def fromSeq(a: Seq[Int]) = a match { - case r: Range => ParRange(r.start, r.end, r.step, false) + case r: Range => + val pr = ParRange(r.start, r.end, r.step, false) + pr.tasksupport = tasksupport + pr case _ => val pa = new parallel.mutable.ParArray[Int](a.length) + pa.tasksupport = tasksupport for (i <- 0 until a.length) pa(i) = a(i) pa } |