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
15 changes: 14 additions & 1 deletion src/array_partition.jl
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,19 @@ function recursivecopy!(A::ArrayPartition, B::ArrayPartition)
end
recursivecopy(A::ArrayPartition) = ArrayPartition(copy.(A.x))

function recursivecopy(A::ArrayPartition{
T, S}) where {T, S <: Tuple{Vararg{AbstractVectorOfArray}}}
return ArrayPartition(map(recursivecopy, A.x))
end

function recursivecopy!(A::ArrayPartition{T, S},
B::ArrayPartition{T, S}) where {T, S <: Tuple{Vararg{AbstractVectorOfArray}}}
for i in eachindex(A.x, B.x)
recursivecopy!(A.x[i], B.x[i])
end
return A
end

recursive_mean(A::ArrayPartition) = mean((recursive_mean(x) for x in A.x))

# note: consider only first partition for recursive one and eltype
Expand Down Expand Up @@ -475,7 +488,7 @@ end
## Linear Algebra

function ArrayInterface.zeromatrix(A::ArrayPartition)
x = reduce(vcat,vec.(A.x))
x = reduce(vcat, vec.(A.x))
x .* x' .* false
end

Expand Down
19 changes: 18 additions & 1 deletion test/partitions_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,23 @@ y = ArrayPartition(ArrayPartition([1], [2.0]), ArrayPartition([3], [4.0]))
@inferred recursive_one(x)
@inferred recursive_bottom_eltype(x)

src_voa = VectorOfArray([[1.0, 2.0], [3.0, 4.0]])
src_ap = ArrayPartition(src_voa)

copied_ap = recursivecopy(src_ap)
@test copied_ap.x[1].u[1] == src_ap.x[1].u[1]
@test copied_ap.x[1].u[2] == src_ap.x[1].u[2]
@test copied_ap.x[1].u[1] !== src_ap.x[1].u[1]
@test copied_ap.x[1].u[2] !== src_ap.x[1].u[2]

dest_voa = VectorOfArray([zeros(2), zeros(2)])
dest_ap = ArrayPartition(dest_voa)
recursivecopy!(dest_ap, src_ap)
@test dest_ap.x[1].u[1] == src_ap.x[1].u[1]
@test dest_ap.x[1].u[2] == src_ap.x[1].u[2]
@test dest_ap.x[1].u[1] !== src_ap.x[1].u[1]
@test dest_ap.x[1].u[2] !== src_ap.x[1].u[2]

# mapreduce
@inferred Union{Int, Float64} sum(x)
@inferred sum(ArrayPartition(ArrayPartition(zeros(4, 4))))
Expand All @@ -149,7 +166,7 @@ y = ArrayPartition(ArrayPartition([1], [2.0]), ArrayPartition([3], [4.0]))
@test any(isnan, ArrayPartition([2], [NaN]))
@test any(isnan, ArrayPartition([2], ArrayPartition([NaN])))

# all
# all
@test !all(isnan, ArrayPartition([1, 2], [3.0, 4.0]))
@test !all(isnan, ArrayPartition([3.0, 4.0]))
@test !all(isnan, ArrayPartition([NaN], [3.0, 4.0]))
Expand Down
Loading