Fixes Issue JuliaLang#482 (issue with multidimensional sampling) (Jul…

…iaLang#483)
LilithHafner · Apr 14, 2019 · b8a6245 · b8a6245
1 parent 413d51a
commit b8a6245
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/sampling.jl b/src/sampling.jl
@@ -390,7 +390,7 @@ Optionally specify a random number generator `rng` as the first argument
 """
 function sample(rng::AbstractRNG, a::AbstractArray{T}, dims::Dims;
                 replace::Bool=true, ordered::Bool=false) where T
-    sample!(rng, a, Array{T}(undef, dims), rng; replace=replace, ordered=ordered)
+    sample!(rng, a, Array{T}(undef, dims); replace=replace, ordered=ordered)
 end
 sample(a::AbstractArray, dims::Dims; replace::Bool=true, ordered::Bool=false) =
     sample(Random.GLOBAL_RNG, a, dims; replace=replace, ordered=ordered)

diff --git a/test/sampling.jl b/test/sampling.jl
@@ -170,6 +170,13 @@ check_sample_norep(a, (3, 12), 0; ordered=false)
 a = sample(3:12, 5; replace=false, ordered=true)
 check_sample_norep(a, (3, 12), 0; ordered=true)
 
+# tests of multidimensional sampling
+
+a = sample(3:12, (2, 2); replace=false)
+check_sample_norep(a, (3, 12), 0; ordered=false)
+
+@test sample(1:1, (2, 2); replace=true) == ones(Int, 2, 2)
+
 # test of weighted sampling without replacement
 a = [1:10;]
 wv = Weights([zeros(6); 1:4])