map change and constructor from Dict. From #68

Author: jonniedie

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.8.22"
+version = "0.9.0"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/broadcasting.jl

@@ -71,6 +71,11 @@ end
 
 Base.Broadcast.broadcasted(f, x::ComponentArray) = ComponentArray(map(f, getdata(x)), getaxes(x))
 
+# Need a special case here because `map` doesn't follow same rules as normal broadcasting. To be safe and avoid ambiguities,
+# we'll just handle the case where everything is a ComponentArray. Else it falls back to a plain Array output.
+function Base.map(f, xs::ComponentArray{<:Any, <:Any, <:Any, Axes}...) where Axes
+    return ComponentArray(map(f, getdata.(xs)...), getaxes(Axes))
+end
 
 # function Base.copy(bc::BC.Broadcasted{<:CAStyle{InnerStyle, Axes, N}}) where {InnerStyle, Axes,  N}
 #     return ComponentArray{Axes}(Base.copy(BC.broadcasted(bc.f, map(getdata, bc.args)...)))

src/componentarray.jl

@@ -57,9 +57,10 @@ function ComponentArray(data, ax::AbstractAxis...)
     return LazyArray(ComponentArray(x, axs) for x in part_data)
 end
 
-# Entry from NamedTuple or kwargs
+# Entry from NamedTuple, Dict, or kwargs
 ComponentArray{T}(nt::NamedTuple) where T = ComponentArray(make_carray_args(T, nt)...)
 ComponentArray(nt::NamedTuple) = ComponentArray(make_carray_args(nt)...)
+ComponentArray(d::AbstractDict) = ComponentArray(NamedTuple(d))
 ComponentArray{T}(;kwargs...) where T = ComponentArray{T}((;kwargs...))
 ComponentArray(;kwargs...) = ComponentArray((;kwargs...))
 

test/runtests.jl

@@ -56,6 +56,12 @@ end
     @test typeof(ComponentArray{Float32}(undef, (ax,))) == typeof(ca_Float32)
     @test typeof(ComponentArray{MVector{10,Float64}}(undef, (ax,))) == typeof(ca_MVector)
 
+    # Entry from Dict
+    dict1 = Dict(:a=>rand(5), :b=>rand(5,5))
+    dict2 = Dict(:a=>3, :b=>dict1)
+    @test ComponentArray(dict1) isa ComponentArray
+    @test ComponentArray(dict2).b isa ComponentArray
+
     @test ca == ComponentVector(a=100, b=[4, 1.3], c=(a=(a=1, b=[1.0, 4.4]), b=[0.4, 2, 1, 45]))
     @test cmat == ComponentMatrix(a .* a', ax, ax)
     @test_throws DimensionMismatch ComponentVector(sq_mat, ax)
@@ -277,6 +283,12 @@ end
     @test getaxes(x1mat + xmat) == (getaxes(x1)[1], FlatAxis())
     @test getaxes(x1mat + xmat') == (FlatAxis(), getaxes(x1)[1])
 
+    @test map(sqrt, ca) isa ComponentArray
+    @test map(+, ca, sqrt.(ca)) isa ComponentArray
+    @test map(+, sqrt.(ca), Float32.(ca), ca) isa ComponentArray
+    @test map(+, ca, getdata(ca)) isa Array
+    @test map(+, ca, ComponentArray(v=getdata(ca))) isa Array
+
     x1 .+= x2
     @test getdata(x1) == 2getdata(x2)