Skip to content
Merged
Show file tree
Hide file tree
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
23 changes: 12 additions & 11 deletions src/Containers/DenseAxisArray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -856,21 +856,22 @@ end

function Base.sum(
f::F,
x::Union{DenseAxisArray,DenseAxisArrayView};
x::Union{DenseAxisArray{T},DenseAxisArrayView{T}};
dims = Colon(),
) where {F<:Function}
if dims == Colon()
return sum(f(xi) for xi in x)
init = zero(T),
) where {F<:Function,T}
if dims != Colon()
return error(
"`sum(x::DenseAxisArray; dims)` is not supported. Convert the array " *
"to an `Array` using `sum(Array(x); dims=$dims)`, or use an explicit " *
"for-loop summation instead.",
)
end
return error(
"`sum(x::DenseAxisArray; dims)` is not supported. Convert the array " *
"to an `Array` using `sum(Array(x); dims=$dims)`, or use an explicit " *
"for-loop summation instead.",
)
return sum(f(xi) for xi in x; init)
end

function Base.sum(x::Union{DenseAxisArray,DenseAxisArrayView}; dims = Colon())
return sum(identity, x; dims = dims)
function Base.sum(x::Union{DenseAxisArray,DenseAxisArrayView}; kwargs...)
return sum(identity, x; kwargs...)
end

function Base.promote_shape(a::DenseAxisArray, b::DenseAxisArray)
Expand Down
13 changes: 13 additions & 0 deletions test/Containers/test_DenseAxisArray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -990,4 +990,17 @@ function test_issue_4053()
return
end

function test_sum_init()
x = Containers.@container([i in Int[]], i)
@test sum(x) == 0
@test sum(x; init = 1) == 1
y = Containers.@container([i in BigInt[]], i)
y_1 = sum(y)
@test y_1 == 0
@test y_1 isa BigInt
y_2 = sum(y; init = 0)
@test y_2 === 0
return
end

end # module
Loading