summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/MapLike.scala
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-03-18 19:07:38 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2011-03-18 19:07:38 +0000
commit86e8f5ae1dccc9f628b6a3f1bdab7e4e81ae9cbb (patch)
tree2e8a5cc7b5ef666c31a2c99dca990f269b850eb5 /src/library/scala/collection/MapLike.scala
parent0554c378653c47aefaabe48b0ef568f952d1695b (diff)
downloadscala-86e8f5ae1dccc9f628b6a3f1bdab7e4e81ae9cbb.tar.gz
scala-86e8f5ae1dccc9f628b6a3f1bdab7e4e81ae9cbb.tar.bz2
scala-86e8f5ae1dccc9f628b6a3f1bdab7e4e81ae9cbb.zip
Removing toPar* methods, since we've agreed the...
Removing toPar* methods, since we've agreed they're difficult to: - underestand - maintain Also, changed the docs and some tests appropriately. Description: 1) Every collection is now parallelizable - switch to the parallel version of the collection is done via `par`. - Traversable collections and iterators have `par` return a parallel - collection of type `ParIterable[A]` with the implementation being the - representative of `ParIterable`s (currently, `ParArray`). Iterable - collections do the same thing. Sequences refine `par`'s returns type - to `ParSeq[A]`. Maps and sets do a similar thing. The above means that the contract for `par` changed - it is no longer guaranteed to be O(1), nor reflect the same underlying data, as was the case for mutable collections before. Method `par` is now at worst linear. Furthermore, specific collection implementations override `par` to a more efficient alternative - instead of copying the dataset, the dataset is shared between the old and the new version. Implementation complexity may be sublinear or constant in these cases, and the underlying data structure may be shared. Currently, these data structures include parallel arrays, maps and sets, vectors, hash trie maps and sets, and ranges. Finally, parallel collections implement `par` trivially. 2) Methods `toMap`, `toSet`, `toSeq` and `toIterable` have been refined for parallel collections to switch between collection types, however, they never switch an implementation from parallel to sequential. They may or may not copy the elements, as is the case with sequential variants of these methods. 3) The preferred way to switch between different collection types, whether maps, sets and seqs, or parallel and sequential, is now via use of methods `toIterable`, `toSeq`, `toSet` and `toMap` in combination with `par` and `seq`. Review by odersky.
Diffstat (limited to 'src/library/scala/collection/MapLike.scala')
-rw-r--r--src/library/scala/collection/MapLike.scala6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/library/scala/collection/MapLike.scala b/src/library/scala/collection/MapLike.scala
index 6fb971d128..fd58540086 100644
--- a/src/library/scala/collection/MapLike.scala
+++ b/src/library/scala/collection/MapLike.scala
@@ -12,6 +12,7 @@ package scala.collection
import generic._
import mutable.{ Builder, MapBuilder }
import annotation.migration
+import parallel.ParMap
/** A template trait for maps, which associate keys with values.
*
@@ -56,7 +57,8 @@ import annotation.migration
trait MapLike[A, +B, +This <: MapLike[A, B, This] with Map[A, B]]
extends PartialFunction[A, B]
with IterableLike[(A, B), This]
- with Subtractable[A, This] {
+ with Subtractable[A, This]
+ with Parallelizable[(A, B), ParMap[A, B]] {
self =>
/** The empty map of the same type as this map
@@ -311,6 +313,8 @@ self =>
result
}
+ protected[this] override def parCombiner = ParMap.newCombiner[A, B]
+
/** Appends all bindings of this map to a string builder using start, end, and separator strings.
* The written text begins with the string `start` and ends with the string
* `end`. Inside, the string representations of all bindings of this map