Skip to content

Commit bd4658b

Browse files
committed
Updated
1 parent 6326604 commit bd4658b

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

src/componentarray.jl

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -360,20 +360,6 @@ julia> merge(c2,c1)
360360
ComponentVector{Float64}(a = 1.2, h = 4.0, b = 2.3)
361361
```
362362
"""
363-
function Base.merge(ca::ComponentVector{T}, ca2::ComponentVector{T}) where T
364-
ax = getaxes(ca)
365-
ax2 = getaxes(ca2)
366-
vks = valkeys(ax[1])
367-
vks2 = valkeys(ax2[1])
368-
_p = Vector{T}()
369-
sizehint!(_p, length(c1) + length(ca2))
370-
for vk in vks
371-
if vk in vks2
372-
_p = vcat(_p, ca2[vk])
373-
else
374-
_p = vcat(_p, ca[vk])
375-
end
376-
end
377-
ComponentArray(_p, merged_ax)
378-
end
379-
Base.merge(a::ComponentVector, b::ComponentVector, cs::ComponentVector) = merge(merge(a,b), cs...)
363+
Base.merge(ca::ComponentVector) = ca
364+
Base.merge(ca1::ComponentVector, ca2::ComponentVector) = ComponentVector(ca1; ca2...)
365+
Base.merge(ca1::ComponentVector, ca2::ComponentVector, cs::ComponentVector) = merge(merge(ca1,ca2), others...)

0 commit comments

Comments
 (0)