let reindex ViewAxis reuse previous axis

instead of just indexmap, fixes jonniedie#134
bgctw · Jun 1, 2022 · ed03b81 · ed03b81
1 parent 5a81362
commit ed03b81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/axis.jl b/src/axis.jl
@@ -148,7 +148,7 @@ Base.keys(ax::AbstractAxis) = keys(indexmap(ax))
 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))
+reindex(ax::ViewAxis, offset) = ViewAxis(viewindex(ax) .+ offset, ax.ax)
 
 # Get AbstractAxis index
 @inline Base.getindex(::AbstractAxis, idx) = ComponentIndex(idx)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -590,6 +590,13 @@ end
     # Issue #100
     chol = cholesky(cmat + I)
     @test convert(Cholesky{Float32,Matrix{Float32}}, chol).factors isa Matrix{Float32}
+
+    # Issue #134
+    boid = ComponentArray(pos=zeros(2), vel=zeros(2))   
+    u0 = ComponentArray(boids=repeat([boid], 2))    
+    u0.boids
+    tmp = u0[KeepIndex(:boids)]
+    @test tmp.boids == u0.boids
 end
 
 @testset "Autodiff" begin