Skip to content

[WIP] Merge ComponentVectors #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions src/ComponentArrays.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module ComponentArrays

import ChainRulesCore
import StaticArrayInterface, ArrayInterface, Functors
import Base.merge

using LinearAlgebra

Expand Down
57 changes: 56 additions & 1 deletion src/componentarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ directly on an `AbstractAxis`.

# Examples

```julia-repl
```jldoctest
julia> using ComponentArrays

julia> ca = ComponentArray(a=1, b=[1,2,3], c=(a=4,))
Expand All @@ -336,3 +336,58 @@ julia> sum(prod(ca[k]) for k in valkeys(ca))
return :($k)
end
valkeys(ca::ComponentVector) = valkeys(getaxes(ca)[1])

"""
merge(cvec1::ComponentVector, cvecs::ComponentVector...)

Construct a new ComponentVector by merging two or more existing ones, in a left-associative
manner. If a key is present in two or more CVectors, the right-most CVector takes priority.
The type of the resulting CVector will be promoted to accomodate all the types of the merged
CVectors

# Examples
```jldoctest
julia> c1 = ComponentArray(a=1.2, b=2.3)
ComponentVector{Float64}(a = 1.2, b = 2.3)

julia> c2 = ComponentArray(a=1,h=4)
ComponentVector{Int64}(a = 1, h = 4)

julia> merge(c1,c2)
ComponentVector{Float64}(a = 1.0, b = 2.3, h = 4.0)

julia> merge(c2,c1)
ComponentVector{Float64}(a = 1.2, h = 4.0, b = 2.3)
```
"""
Base.merge(ca::ComponentVector) = ca
function Base.merge(ca1::ComponentVector{T1}, ca2::ComponentVector{T2}) where {T1,T2}
ax = getaxes(ca1)
ax2 = getaxes(ca2)
vks = valkeys(ax[1])
vks2 = valkeys(ax2[1])
idxmap = indexmap(ax[1])
_p = Vector{promote_type(T1,T2)}()
sizehint!(_p, length(ca1)+length(ca2))
for vk in vks
if vk in vks2
_p = vcat(_p, ca2[vk])
else
_p = vcat(_p, ca1[vk])
end
end
new_idxmap = Vector{Pair{Symbol, Int64}}([])
sizehint!(new_idxmap, length(ca2))
max_val = maximum(idxmap)
for vk in vks2
if !(vk in vks)
_p = vcat(_p, ca2[vk])
new_idxmap = vcat(new_idxmap, [getval(vk)=>max_val+1])
max_val += 1
end
end
merged_ax = Axis(merge(idxmap, new_idxmap))
ComponentArray(_p, merged_ax)
end

Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), cs...)