Merge pull request #785 from axel22/feature/to-par

Parallelize convertTo in parallel collection.

2 files changed, 27 insertions, 1 deletions

diff --git a/test/files/run/collection-conversions.check b/test/files/run/collection-conversions.check
index 08d0fa32c5..5e43d25f7e 100644
--- a/test/files/run/collection-conversions.check
+++ b/test/files/run/collection-conversions.check
@@ -11,6 +11,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing Vector ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -24,6 +25,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing List ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -37,6 +39,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing Buffer ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -50,6 +53,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing ParVector ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -63,6 +67,21 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
+-- Testing ParArray ---
+  :[Direct] Vector   : OK
+  :[Copy]   Vector   : OK
+  :[Direct] Buffer   : OK
+  :[Copy]   Buffer   : OK
+  :[Direct] GenSeq   : OK
+  :[Copy]   GenSeq   : OK
+  :[Copy]   Seq      : OK
+  :[Direct] Stream   : OK
+  :[Copy]   Stream   : OK
+  :[Direct] Array    : OK
+  :[Copy]   Array    : OK
+  :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing Set ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -76,6 +95,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing SetView ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -89,6 +109,7 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
 -- Testing BufferView ---
   :[Direct] Vector   : OK
   :[Copy]   Vector   : OK
@@ -102,3 +123,4 @@
   :[Direct] Array    : OK
   :[Copy]   Array    : OK
   :[Copy]   ParVector: OK
+  :[Copy]   ParArray : OK
\ No newline at end of file
diff --git a/test/files/run/collection-conversions.scala b/test/files/run/collection-conversions.scala
index b5c4d8e261..6d90caee4b 100644
--- a/test/files/run/collection-conversions.scala
+++ b/test/files/run/collection-conversions.scala
@@ -1,6 +1,7 @@
 import collection._
 import mutable.Buffer
 import parallel.immutable.ParVector
+import parallel.mutable.ParArray
 import reflect.ClassTag
 
 object Test {
@@ -29,6 +30,7 @@ object Test {
   val testStream = Stream(1,2,3)
   val testArray = Array(1,2,3)
   val testParVector = ParVector(1,2,3)
+  val testParArray = ParArray(1,2,3)
 
   def testConversion[A: ClassTag](name: String, col: => GenTraversableOnce[A]): Unit = {
     val tmp = col
@@ -45,14 +47,16 @@ object Test {
     printResult("[Direct] Array    ", col.toArray, testArray)
     printResult("[Copy]   Array    ", col.convertTo[Array], testArray)
     printResult("[Copy]   ParVector", col.convertTo[ParVector], testParVector)
+    printResult("[Copy]   ParArray ", col.convertTo[ParArray], testParArray)
   }
   
   def main(args: Array[String]): Unit = {
-	  testConversion("iterator", (1 to 3).iterator)
+    testConversion("iterator", (1 to 3).iterator)
     testConversion("Vector", Vector(1,2,3))
     testConversion("List", List(1,2,3))
     testConversion("Buffer", Buffer(1,2,3))
     testConversion("ParVector", ParVector(1,2,3))
+    testConversion("ParArray", ParArray(1,2,3))
     testConversion("Set", Set(1,2,3))
     testConversion("SetView", Set(1,2,3).view)
     testConversion("BufferView", Buffer(1,2,3).view)