disable make(t::AbstractFloat, X, dims)

Author: rfourquet

src/containers.jl

@@ -76,28 +76,30 @@ end
 
 macro make_array_container(Cont)
     definitions =
-        [ :(rand(rng::AbstractRNG,            $Cont, dims::Dims) =                 rand(rng,        make(t, dims))),
-          :(rand(                             $Cont, dims::Dims) =                 rand(GLOBAL_RNG, make(t, dims))),
-          :(rand(rng::AbstractRNG,            $Cont, dims::Integer...) =           rand(rng,        make(t, Dims(dims)))),
-          :(rand(                             $Cont, dims::Integer...) =           rand(GLOBAL_RNG, make(t, Dims(dims)))),
-
-          :(rand(rng::AbstractRNG, X,         $Cont, dims::Dims) =                 rand(rng,        make(t, X, dims))),
-          :(rand(                  X,         $Cont, dims::Dims) =                 rand(GLOBAL_RNG, make(t, X, dims))),
-          :(rand(rng::AbstractRNG, X,         $Cont, dims::Integer...) =           rand(rng,        make(t, X, Dims(dims)))),
-          :(rand(                  X,         $Cont, dims::Integer...) =           rand(GLOBAL_RNG, make(t, X, Dims(dims)))),
-
-          :(rand(rng::AbstractRNG, ::Type{X}, $Cont, dims::Dims)       where {X} = rand(rng,        make(t, X, dims))),
-          :(rand(                  ::Type{X}, $Cont, dims::Dims)       where {X} = rand(GLOBAL_RNG, make(t, X, dims))),
-          :(rand(rng::AbstractRNG, ::Type{X}, $Cont, dims::Integer...) where {X} = rand(rng,        make(t, X, Dims(dims)))),
-          :(rand(                  ::Type{X}, $Cont, dims::Integer...) where {X} = rand(GLOBAL_RNG, make(t, X, Dims(dims)))),
+        [ :(rand(rng::AbstractRNG,            $Cont, dims::Dims) =                 rand(rng,        _make_cont(t, dims))),
+          :(rand(                             $Cont, dims::Dims) =                 rand(GLOBAL_RNG, _make_cont(t, dims))),
+          :(rand(rng::AbstractRNG,            $Cont, dims::Integer...) =           rand(rng,        _make_cont(t, Dims(dims)))),
+          :(rand(                             $Cont, dims::Integer...) =           rand(GLOBAL_RNG, _make_cont(t, Dims(dims)))),
+
+          :(rand(rng::AbstractRNG, X,         $Cont, dims::Dims) =                 rand(rng,        _make_cont(t, X, dims))),
+          :(rand(                  X,         $Cont, dims::Dims) =                 rand(GLOBAL_RNG, _make_cont(t, X, dims))),
+          :(rand(rng::AbstractRNG, X,         $Cont, dims::Integer...) =           rand(rng,        _make_cont(t, X, Dims(dims)))),
+          :(rand(                  X,         $Cont, dims::Integer...) =           rand(GLOBAL_RNG, _make_cont(t, X, Dims(dims)))),
+
+          :(rand(rng::AbstractRNG, ::Type{X}, $Cont, dims::Dims)       where {X} = rand(rng,        _make_cont(t, X, dims))),
+          :(rand(                  ::Type{X}, $Cont, dims::Dims)       where {X} = rand(GLOBAL_RNG, _make_cont(t, X, dims))),
+          :(rand(rng::AbstractRNG, ::Type{X}, $Cont, dims::Integer...) where {X} = rand(rng,        _make_cont(t, X, Dims(dims)))),
+          :(rand(                  ::Type{X}, $Cont, dims::Integer...) where {X} = rand(GLOBAL_RNG, _make_cont(t, X, Dims(dims)))),
         ]
     esc(Expr(:block, definitions...))
 end
 
+_make_cont(args...) = make(args...)
+
 @make_array_container(t::Type{<:Array})
 @make_array_container(t::Type{<:BitArray})
 @make_array_container(t::AbstractFloat)
-
+_make_cont(t::AbstractFloat, x, dims::Dims) = make(x, t, dims)
 
 ## sets/dicts
 

src/sampling.jl

@@ -447,8 +447,6 @@ make(::Type{X}, p::AbstractFloat, dims::Integer...) where {X} = make(X,
 make(           p::AbstractFloat, dims::Dims)                 = make(default_sampling(AbstractArray), p, dims)
 make(           p::AbstractFloat, dims::Integer...)           = make(default_sampling(AbstractArray), p, Dims(dims))
 
-# to make @make_array_container work:
-make(p::AbstractFloat, X, dims::Dims) = make(X, p, dims)
 
 Sampler(RNG::Type{<:AbstractRNG}, c::Make3{A}, n::Repetition) where {A<:AbstractSparseArray} =
     SamplerTag{A}((sp = sampler(RNG, c.x, n),