Common shuffle/shuffled with the specified random source

KT-17261, KT-9010
This commit is contained in:
Ilya Gorbunov
2018-07-03 03:45:09 +03:00
parent cc031e3a40
commit 7e4528e217
4 changed files with 42 additions and 11 deletions
+2 -11
View File
@@ -6,7 +6,7 @@
package kotlin.collections
import kotlin.comparisons.naturalOrder
import kotlin.math.floor
import kotlin.random.Random
/** Returns the array if it's not `null`, or an empty array otherwise. */
@kotlin.internal.InlineOnly
@@ -87,16 +87,7 @@ public actual fun <T> MutableList<T>.fill(value: T): Unit {
* See: https://en.wikipedia.org/wiki/Fisher%E2%80%93Yates_shuffle#The_modern_algorithm
*/
@SinceKotlin("1.2")
public actual fun <T> MutableList<T>.shuffle(): Unit {
for (i in lastIndex downTo 1) {
val j = rand(i + 1)
val copy = this[i]
this[i] = this[j]
this[j] = copy
}
}
private fun rand(upperBound: Int) = floor(kotlin.js.Math.random() * upperBound).toInt()
public actual fun <T> MutableList<T>.shuffle(): Unit = shuffle(Random)
/**
* Returns a new list with the elements of this list randomly shuffled.