sample call fails with error (JuliaLang#272)

* Array shouldn't be parameterised on T and change from sample! to sample * Add simple tests for weighted sampling with a dimension
LilithHafner · Jun 2, 2017 · 41a76c2 · 41a76c2
1 parent cd9e4ab
commit 41a76c2
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
@@ -719,7 +719,7 @@ sample{T}(rng::AbstractRNG, a::AbstractArray{T}, wv::AbstractWeights, dims::Dims
     sample!(rng, a, wv, Array{T}(dims); replace=replace, ordered=ordered)
 sample(a::AbstractArray, wv::AbstractWeights, dims::Dims;
        replace::Bool=true, ordered::Bool=false) =
-    sample!(Base.GLOBAL_RNG, a, wv, Array{T}(dims); replace=replace, ordered=ordered)
+    sample(Base.GLOBAL_RNG, a, wv, dims; replace=replace, ordered=ordered)
 
 # wsample interface
 

diff --git a/test/sampling.jl b/test/sampling.jl
@@ -208,3 +208,10 @@ x = vcat([sample(a, wv, 4, replace=false) for j in 1:10000]...)
 
 wv = Weights([zeros(5); 1:4; -1])
 @test_throws ErrorException sample(a, wv, 1, replace=false)
+
+#### weighted sampling with dimension
+srand(1);
+
+@test sample([1, 2], Weights([1, 1]), (2,2)) == ones(2,2)
+@test sample([1, 2], Weights([0, 1]), (2,2)) == [2 2 ; 2 2]
+@test sample(collect(1:4), Weights(1:4), (2,2), replace=false) == [4 1; 3 2]