diff --git a/.travis.yml b/.travis.yml index bd4d2c5..c18aa1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: julia julia: - # - 0.6 + - 0.6 - nightly os: - linux diff --git a/REQUIRE b/REQUIRE index c93651c..9106016 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,5 +1,5 @@ julia 0.6.0-pre Compat 0.8.6 -StatsBase 0.14.0 +StatsBase 0.15.0 Reexport SpecialFunctions diff --git a/src/extras.jl b/src/extras.jl index 709a1cf..a567313 100644 --- a/src/extras.jl +++ b/src/extras.jl @@ -5,7 +5,7 @@ function StatsBase.addcounts!{T,U}(cm::Dict{U,Int}, x::AbstractDataArray{T}) return cm end -function StatsBase.addcounts!{T,U,W}(cm::Dict{U,W}, x::AbstractDataArray{T}, wv::WeightVec{W}) +function StatsBase.addcounts!{T,U,W}(cm::Dict{U,W}, x::AbstractDataArray{T}, wv::Weights{W}) n = length(x) length(wv) == n || raise_dimerror() w = values(wv) @@ -23,7 +23,7 @@ function StatsBase.countmap{T}(x::AbstractDataArray{T}) addcounts!(Dict{Union{T, NAtype}, Int}(), x) end -function StatsBase.countmap{T,W}(x::AbstractDataArray{T}, wv::WeightVec{W}) +function StatsBase.countmap{T,W}(x::AbstractDataArray{T}, wv::Weights{W}) addcounts!(Dict{Union{T, NAtype}, W}(), x, wv) end diff --git a/src/reduce.jl b/src/reduce.jl index 7cb7a2b..015db0f 100644 --- a/src/reduce.jl +++ b/src/reduce.jl @@ -175,7 +175,7 @@ Base.std(A::DataArray; corrected::Bool=true, mean=nothing, skipna::Bool=false) = ## weighted mean -function Base.mean(a::DataArray, w::WeightVec; skipna::Bool=false) +function Base.mean(a::DataArray, w::Weights; skipna::Bool=false) if skipna v = a .* w.values sum(v; skipna=true) / sum(DataArray(w.values, v.na); skipna=true) @@ -184,7 +184,7 @@ function Base.mean(a::DataArray, w::WeightVec; skipna::Bool=false) end end -function Base.mean{W,V<:DataArray}(a::DataArray, w::WeightVec{W,V}; skipna::Bool=false) +function Base.mean{W,V<:DataArray}(a::DataArray, w::Weights{W,V}; skipna::Bool=false) if skipna v = a .* w.values sum(v; skipna=true) / sum(DataArray(w.values.data, v.na); skipna=true)