diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-20 20:19:46 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-20 20:19:46 +0000 |
commit | d33724e24bbb0a5b2cb650f207a283f59ad68dd5 (patch) | |
tree | 34fb308470bedfd43fe7e59bbd4abe580a40eb78 /src | |
parent | eeb70cd5f422e51d2be0658c4ad0b9e7f3d7b4fb (diff) | |
download | scala-d33724e24bbb0a5b2cb650f207a283f59ad68dd5.tar.gz scala-d33724e24bbb0a5b2cb650f207a283f59ad68dd5.tar.bz2 scala-d33724e24bbb0a5b2cb650f207a283f59ad68dd5.zip |
Added stubs to parallel hash map. No review
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/collection/parallel/mutable/ParHashMap.scala | 22 | ||||
-rw-r--r-- | src/library/scala/collection/parallel/mutable/ParMap.scala | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/src/library/scala/collection/parallel/mutable/ParHashMap.scala b/src/library/scala/collection/parallel/mutable/ParHashMap.scala index db0c6ac50a..057faa66e1 100644 --- a/src/library/scala/collection/parallel/mutable/ParHashMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParHashMap.scala @@ -4,16 +4,16 @@ package mutable +import collection.generic._ -/* -class ParHashMap[K, +V] +class ParHashMap[K, V] extends ParMap[K, V] with GenericParMapTemplate[K, V, ParHashMap] - with ParMapLike[K, V] + with ParMapLike[K, V, ParHashMap[K, V], collection.mutable.HashMap[K, V]] { self => @@ -25,18 +25,30 @@ self => def seq = null // TODO + def get(k: K): Option[V] = null // TODO + def +=(kv: (K, V)) = null // TODO + + def -=(k: K) = null // TODO + + override def size = 0 // TODO } -object ParHashMap { +object ParHashMap extends ParMapFactory[ParHashMap] { + + def empty[K, V]: ParHashMap[K, V] = new ParHashMap[K, V] + + def newCombiner[K, V]: Combiner[(K, V), ParHashMap[K, V]] = null // TODO + + implicit def canBuildFrom[K, V]: CanCombineFrom[Coll, (K, V), ParHashMap[K, V]] = null // TODO } -*/ + diff --git a/src/library/scala/collection/parallel/mutable/ParMap.scala b/src/library/scala/collection/parallel/mutable/ParMap.scala index c5fccf45ae..63342fa1bc 100644 --- a/src/library/scala/collection/parallel/mutable/ParMap.scala +++ b/src/library/scala/collection/parallel/mutable/ParMap.scala @@ -11,9 +11,9 @@ import collection.parallel.Combiner trait ParMap[K, V] extends collection.mutable.Map[K, V] with collection.parallel.ParMap[K, V] - with ParIterable[(K, V)] + with /* mutable */ ParIterable[(K, V)] with GenericParMapTemplate[K, V, ParMap] - with ParMapLike[K, V, ParMap[K, V], collection.mutable.Map[K, V]] + with /* mutable */ ParMapLike[K, V, ParMap[K, V], collection.mutable.Map[K, V]] { override def mapCompanion: GenericParMapCompanion[ParMap] = ParMap |