mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
rand: move the shuffle function from arrays
to rand.util
(#8587)
This commit is contained in:
@ -3,9 +3,7 @@ module arrays
|
||||
// Common arrays functions:
|
||||
// - min / max - return the value of the minumum / maximum
|
||||
// - idx_min / idx_max - return the index of the first minumum / maximum
|
||||
// - shuffle - randomize array items order in place (allowing exit after n items)
|
||||
// - merge - combine two sorted arrays and maintain sorted order
|
||||
import rand
|
||||
|
||||
// min returns the minimum
|
||||
[direct_array_access]
|
||||
@ -71,22 +69,6 @@ pub fn idx_max<T>(a []T) int {
|
||||
return idx
|
||||
}
|
||||
|
||||
// shuffle randomizes the first n items of an array in place (all if n=0)
|
||||
[direct_array_access]
|
||||
pub fn shuffle<T>(mut a []T, n int) {
|
||||
if n < 0 || n > a.len {
|
||||
panic("shuffle's argument 'n' must be in range [0,a.len]")
|
||||
}
|
||||
cnt := if n == 0 { a.len - 1 } else { n }
|
||||
for i in 0 .. cnt {
|
||||
x := rand.int_in_range(i, a.len)
|
||||
// swap
|
||||
a_i := a[i]
|
||||
a[i] = a[x]
|
||||
a[x] = a_i
|
||||
}
|
||||
}
|
||||
|
||||
// merge two sorted arrays (ascending) and maintain sorted order
|
||||
[direct_array_access]
|
||||
pub fn merge<T>(a []T, b []T) []T {
|
||||
@ -119,3 +101,8 @@ pub fn merge<T>(a []T, b []T) []T {
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
[deprecated]
|
||||
pub fn shuffle<T>(mut a []T, n int) {
|
||||
panic('Please use rand.util.shuffle() instead')
|
||||
}
|
||||
|
Reference in New Issue
Block a user