diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-06-29 12:14:05 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-06-29 12:14:05 +1000 |
commit | 04e7448d42492c0f35a42c69cbac41a8cdff724e (patch) | |
tree | bb02c70f8451106212bdff5b06f574b68cdf59f8 /test/benchmarks/src | |
parent | 1b25705c662aba04cdd3d16b790963856b16206b (diff) | |
parent | 0ff6c81dd3e3e3a60d8f2db845ada167c8266395 (diff) | |
download | scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.gz scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.tar.bz2 scala-04e7448d42492c0f35a42c69cbac41a8cdff724e.zip |
Merge pull request #4589 from janekdb/2.11.x-method-names-m-o
Improve method names (m-o)
Diffstat (limited to 'test/benchmarks/src')
-rw-r--r-- | test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala index ba32036002..9300851b5f 100644 --- a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala +++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala @@ -425,7 +425,7 @@ trait SequentialOps[T] { } def sequentialDiff(sq: Seq[T], sz: Int) = { - val occmap = occurences(sq) + val occmap = occurrences(sq) val b = new collection.mutable.ArrayBuffer[T] var i = 0 @@ -442,7 +442,7 @@ trait SequentialOps[T] { } def sequentialIntersect(sq: Seq[T], sz: Int) = { - val occmap = occurences(sq) + val occmap = occurrences(sq) val b = new collection.mutable.ArrayBuffer[T] var i = 0 @@ -461,7 +461,7 @@ trait SequentialOps[T] { res } - private def occurences(sq: Seq[T]) = { + private def occurrences(sq: Seq[T]) = { val occmap = new collection.mutable.HashMap[T, Int] { override def default(k: T) = 0 } for (elem <- sq.iterator) occmap(elem) += 1 occmap |