Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Statistics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,14 @@ over dimensions, and `mean` may contain means for each dimension of `itr`.
Use the [`skipmissing`](@ref) function to omit `missing` entries and compute the
variance of non-missing values.
"""
var(A::AbstractArray; corrected::Bool=true, mean=nothing, dims=:) = _var(A, corrected, mean, dims)
var(A::AbstractArray; corrected::Bool=true, dims=:, mean=Statistics.mean(A, dims=dims)) =
_var(A, corrected, mean, dims)

_var(A::AbstractArray, corrected::Bool, mean, dims) =
varm(A, something(mean, Statistics.mean(A, dims=dims)); corrected=corrected, dims=dims)
varm(A, mean; corrected=corrected, dims=dims)

_var(A::AbstractArray, corrected::Bool, mean, ::Colon) =
real(varm(A, something(mean, Statistics.mean(A)); corrected=corrected))
real(varm(A, mean; corrected=corrected))

varm(iterable, m; corrected::Bool=true) = _var(iterable, corrected, m)

Expand Down Expand Up @@ -405,7 +406,8 @@ over dimensions, and `means` may contain means for each dimension of `itr`.
Use the [`skipmissing`](@ref) function to omit `missing` entries and compute the
standard deviation of non-missing values.
"""
std(A::AbstractArray; corrected::Bool=true, mean=nothing, dims=:) = _std(A, corrected, mean, dims)
std(A::AbstractArray; corrected::Bool=true, dims=:, mean=Statistics.mean(A, dims=dims)) =
_std(A, corrected, mean, dims)

_std(A::AbstractArray, corrected::Bool, mean, dims) =
sqrt.(var(A; corrected=corrected, mean=mean, dims=dims))
Expand Down