add make(Tuple, s, n::Integer)

Author: rfourquet

src/containers.jl

@@ -64,7 +64,7 @@ end
 @make_container(p::AbstractFloat, m::Integer, [n::Integer])
 # Tuple as a container
 @make_container(T::Type{<:Tuple})
-
+@make_container(::Type{Tuple}, n::Integer)
 
 ## arrays (same as in Random, but with explicit type specification, e.g. rand(Int, Array, 4)
 

src/sampling.jl

@@ -182,6 +182,9 @@ end
 
 make(T::Type{<:Tuple}, args...) = _make(T, args...)
 
+make(::Type{Tuple}, X,         n::Integer)           = make(NTuple{Int(n)}, X)
+make(::Type{Tuple}, ::Type{X}, n::Integer) where {X} = make(NTuple{Int(n)}, X)
+
 # disambiguate
 
 make(::Type{T}, X)         where {T<:Tuple}   = _make(T, X)

test/runtests.jl

@@ -182,6 +182,10 @@ const spString = Sampler(MersenneTwister, String)
     s = rand(rng..., 1:3, Tuple{Int8, UInt8})
     @test s isa Tuple{Int8, UInt8}
     @test all(in(1:3), s)
+
+    s = rand(rng..., 1:3, Tuple, 4)
+    @test s isa NTuple{4,Int}
+    @test all(in(1:3), s)
 end
 
 @testset "Rand" for rng in ([], [MersenneTwister(0)], [RandomDevice()])
@@ -272,6 +276,13 @@ end
 
     @test rand(make(Tuple{Int8,Int8})) isa Tuple{Int8,Int8}
     @test rand(make(Tuple{Int8,UInt})) isa Tuple{Int8,UInt}
+
+    # make(Tuple, s, n)
+    s = rand(make(Tuple, 1:3, 4))
+    @test s isa NTuple{4,Int}
+    @test all(in(1:3), s)
+    s = rand(make(Tuple, Int8, 4))
+    @test s isa NTuple{4,Int8}
 end
 
 @testset "rand(make(NTuple{N}/Tuple{...}, x))" begin