Broadcasting on CompositionArrays returns CompositionArrays

Author: brenhinkeller

src/utilities/CompositionArrays.jl

@@ -8,7 +8,8 @@ CompositionArray{C}(args...; kwargs...) where {C<:AbstractComposition} = Composi
 CompositionArray(d::Dict) = CompositionArray(TupleDataset(d))
 CompositionArray{C}(d::Dict) where {C<:AbstractComposition} = CompositionArray{C}(TupleDataset(d))
 # Convert CompositionArrays to other CompositionArrays
-CompositionArray{C}(a::CompositionArray) where {C<:AbstractComposition} = CompositionArray(C.(a))
+CompositionArray(a::CompositionArray) = a
+CompositionArray{C}(a::CompositionArray) where {C<:AbstractComposition} = C.(a)
 export CompositionArray
 
 # Type aliases for vectors and matrices
@@ -54,10 +55,10 @@ Base.sizehint!(A::CompositionArray, i::Integer) = sizehint!(getfield(A, :data))
 Base.copy(A::CompositionArray) = CompositionArray(copy(getfield(A, :data)))
 
 # # Broadcasting interface (enable this if we want broadcasting on CompositionArrays to return CompositionArrays)
-# struct CompositionArrayStyle <: Broadcast.BroadcastStyle end
-# Broadcast.BroadcastStyle(::Type{CompositionArray}) = CompositionArrayStyle()
-# Broadcast.BroadcastStyle(::CompositionArrayStyle, ::Broadcast.DefaultArrayStyle) = CompositionArrayStyle()
-# Base.similar(bc::Base.Broadcast.Broadcasted{CompositionArrayStyle}, ::Type{T}) where {T} = similar(CompositionArray{T}, axes(bc))
+struct CompositionArrayStyle <: Base.Broadcast.BroadcastStyle end
+Base.Broadcast.BroadcastStyle(::Type{<:CompositionArray}) = CompositionArrayStyle()
+Base.Broadcast.BroadcastStyle(::CompositionArrayStyle, ::Base.Broadcast.DefaultArrayStyle) = CompositionArrayStyle()
+Base.similar(bc::Base.Broadcast.Broadcasted{CompositionArrayStyle}, ::Type{T}) where {T} = similar(CompositionArray{T}, axes(bc))
 
 # Other Base functions
 function Base.isapprox(x::CompositionArray, y::CompositionArray; kwargs...)

test/testComposition.jl

@@ -300,6 +300,8 @@ renormalize!(ca; anhydrous=true)
 @test ca[1] + ca[1] ≈ 2 * ca[1]
 @test (ca[1]*ca[1])/ca[1] ≈ ca[1]
 # Test dot-broadcasting on compositions / compositionarrays
+@test (ca .+ ca)::CompositionVector{NCKFMASHTOlogtrace{Float64}} ≈ (2 .* ca)::CompositionVector{NCKFMASHTOlogtrace{Float64}}
+@test ((ca .* ca)./ca)::CompositionVector{NCKFMASHTOlogtrace{Float64}} ≈ ca
 @test CompositionArray(ca .+ ca) ≈ CompositionArray(2 .* ca)
 @test CompositionArray((ca .* ca)./ca) ≈ ca