Merge pull request #301 from dingraha/vcat_shaped_axis

Preserve `ShapedAxis` components during `vcat`

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "ComponentArrays"
 uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
 authors = ["Jonnie Diegelman <47193959+jonniedie@users.noreply.github.com>"]
-version = "0.15.26"
+version = "0.15.27"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/axis.jl

@@ -163,7 +163,7 @@ reindex(i, offset) = i .+ offset
 reindex(ax::FlatAxis, _) = ax
 reindex(ax::Axis, offset) = Axis(map(x->reindex(x, offset), indexmap(ax)))
 reindex(ax::ViewAxis, offset) = ViewAxis(viewindex(ax) .+ offset, indexmap(ax))
-function reindex(ax::ViewAxis{OldInds,IdxMap,Ax}, offset) where {OldInds,IdxMap,Ax<:Shaped1DAxis} 
+function reindex(ax::ViewAxis{OldInds,IdxMap,Ax}, offset) where {OldInds,IdxMap,Ax<:Union{Shaped1DAxis,ShapedAxis}}
     NewInds = viewindex(ax) .+ offset
     return ViewAxis(NewInds, Ax())
 end

test/runtests.jl

@@ -857,6 +857,19 @@ end
         @test all(Xstack4_dcolon[:b, :, :] .== Xstack4_noca_dcolon[2:3, :, :])
     end
 
+    # Test that we maintain higher-order components during vcat.
+    x = ComponentVector(a=rand(Float64, 2, 3, 4), b=rand(Float64, 4, 3, 2))
+    y = ComponentVector(c=rand(Float64, 3, 4, 2), d=rand(Float64, 3, 2, 4))
+    xy = vcat(x, y)
+    @test size(xy.a) == size(x.a)
+    @test size(xy.b) == size(x.b)
+    @test size(xy.c) == size(y.c)
+    @test size(xy.d) == size(y.d)
+    @test all(xy.a .≈ x.a)
+    @test all(xy.b .≈ x.b)
+    @test all(xy.c .≈ y.c)
+    @test all(xy.d .≈ y.d)
+
     # Test fix https://github.com/Deltares/Ribasim/issues/2028
     a = range(0.0, 1.0, length=0) |> collect
     b = range(0.0, 1.0; length=2) |> collect