Merge pull request #261 from jipolanco/jip/recursivefill

Fix `recursivefill!` for `VectorOfArray{<:StaticArray}`

Author: ChrisRackauckas

src/utils.jl

@@ -86,6 +86,14 @@ function recursivefill!(b::AbstractArray{T, N},
     end
 end
 
+function recursivefill!(bs::AbstractVectorOfArray{T, N},
+                        a::T2) where {T <: StaticArraysCore.StaticArray,
+                                      T2 <: StaticArraysCore.StaticArray, N}
+    @inbounds for b in bs, i in eachindex(b)
+        b[i] = copy(a)
+    end
+end
+
 function recursivefill!(b::AbstractArray{T, N},
                         a::T2) where {T <: StaticArraysCore.SArray,
                                       T2 <: Union{Number, Bool}, N}
@@ -94,6 +102,14 @@ function recursivefill!(b::AbstractArray{T, N},
     end
 end
 
+function recursivefill!(bs::AbstractVectorOfArray{T, N},
+                        a::T2) where {T <: StaticArraysCore.SArray,
+                                      T2 <: Union{Number, Bool}, N}
+    @inbounds for b in bs, i in eachindex(b)
+        b[i] = fill(a, typeof(b[i]))
+    end
+end
+
 function recursivefill!(b::AbstractArray{T, N}, a::T2) where {T <: Enum, T2 <: Enum, N}
     fill!(b, a)
 end

test/utils_test.jl

@@ -99,3 +99,21 @@ x = similar(x)
 recursivefill!(x, true)
 @test x[1] == MVector{10}(ones(10))
 @test x[2] == MVector{10}(ones(10))
+
+# Test VectorOfArray + recursivefill! + static arrays
+@testset "VectorOfArray + recursivefill! + static arrays" begin
+    Vec3 = SVector{3, Float64}
+    x = [randn(Vec3, n) for n in 1:4]  # vector of vectors of static arrays
+
+    x_voa = VectorOfArray(x)
+    @test eltype(x_voa) === Vec3
+    @test first(x_voa) isa AbstractVector{Vec3}
+
+    y_voa = recursivecopy(x_voa)
+    recursivefill!(y_voa, true)
+    @test all(y_voa[n] == fill(ones(Vec3), n) for n in 1:4)
+
+    y_voa = recursivecopy(x_voa)
+    recursivefill!(y_voa, ones(Vec3))
+    @test all(y_voa[n] == fill(ones(Vec3), n) for n in 1:4)
+end