From 1f7b3d9ee87c2ef9ceee09c2c0284021cb9ceb2b Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Wed, 8 May 2019 17:13:42 +0200 Subject: [PATCH] Fix TODO --- stdlib/Statistics/src/Statistics.jl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/stdlib/Statistics/src/Statistics.jl b/stdlib/Statistics/src/Statistics.jl index f3756e1b0a01d..2ceb105a44d28 100644 --- a/stdlib/Statistics/src/Statistics.jl +++ b/stdlib/Statistics/src/Statistics.jl @@ -351,9 +351,12 @@ varm(A::AbstractArray, m; corrected::Bool=true, dims=:, varm(iterable, m; corrected::Bool=true) = _var(iterable, corrected, m) -# TODO: choose element type based on weights type too? -_varm(A::AbstractArray, m, corrected::Bool, dims, w::Union{AbstractWeights, Nothing}) = - varm!(Base.reducedim_init(t -> abs2(t)/2, +, A, dims), A, m, w; corrected=corrected) +_varm(A::AbstractArray, m, corrected::Bool, dims, w::Nothing) = + varm!(Base.reducedim_init(t -> abs2(t)/2, +, A, dims), A, m, w, corrected=corrected) + +_varm(A::AbstractArray, m, corrected::Bool, dims, w::AbstractWeights{T}) where {T<:Real} = + varm!(Base.reducedim_init(t -> (abs2(t)*zero(T))/2, +, A, dims), A, m, w, + corrected=corrected) function _varm(A::AbstractArray{T}, m, corrected::Bool, dims::Colon, w::Nothing) where T n = length(A)