bugfix broadcast

src/array.jl

@@ -1,8 +1,4 @@
-"""
-Probably backed by an array, but might not be. Not good for broadcasting.
 
-These arrays should be fixed with a dependency on DiskArrays.jl
-"""
 abstract type AbstractDimensionalArray{T,N,D<:Tuple,A} <: AbstractArray{T,N} end
 
 const AbDimArray = AbstractDimensionalArray

src/broadcast.jl

@@ -28,12 +28,11 @@ end
 
 
 Base.BroadcastStyle(::DimensionalStyle{A}, ::DimensionalStyle{B}) where {A, B} = DimensionalStyle(A(), B())
-Base.BroadcastStyle(::DimensionalStyle{A}, b::BroadcastStyle) where {A, B} = DimensionalStyle(A(), b)
+Base.BroadcastStyle(::DimensionalStyle{A}, b::B) where {A, B} = DimensionalStyle(A(), b)
 Base.BroadcastStyle(a::A, ::DimensionalStyle{B}) where {A, B} = DimensionalStyle(a, B())
 Base.BroadcastStyle(::DimensionalStyle{A}, b::DefaultArrayStyle) where {A} = DimensionalStyle(A(), b)
 Base.BroadcastStyle(a::AbstractArrayStyle{M}, ::DimensionalStyle{B}) where {B,M} = DimensionalStyle(a, B())
 
-
 # We need to implement copy because if the wrapper array type does not support setindex
 # then the `similar` based default method will not work
 function Broadcast.copy(bc::Broadcasted{DimensionalStyle{S}}) where S
@@ -58,8 +57,6 @@ function Base.copyto!(dest::AbstractArray, bc::Broadcasted{DimensionalStyle{S}})
     end
 end
 
-Base.BroadcastStyle(::Type{<:AbDimArray}) = Broadcast.ArrayStyle{AbDimArray}()
-
 # Recursively unwraps `AbstractDimensionalArray`s and `DimensionalStyle`s.
 # replacing the `AbstractDimensionalArray`s with the wrapped array,
 # and `DimensionalStyle` with the wrapped `BroadcastStyle`.

src/primitives.jl

@@ -128,6 +128,9 @@ end
 # TODO deal with unordered arrays trashing the index order
 @inline slicedims(d::AbDim{<:AbstractArray}, i::AbstractArray) =
     (rebuild(d, d[_relate(d, i)]),), ()
+@inline slicedims(d::AbDim{<:Colon}, i::Colon) = (d,), ()
+@inline slicedims(d::AbDim{<:Colon}, i::AbstractArray) = (d,), ()
+@inline slicedims(d::AbDim{<:Colon}, i::Number) = (), (d,)
 
 _relate(d::AbDim, i) = _maybeflip(relationorder(d), d, i)
 

test/broadcast.jl

@@ -4,6 +4,7 @@ using DimensionalData, Test
 
 @testset "Binary broadcasting operations (.+)" begin
     da = DimensionalArray(ones(3), X)
+    @test Base.BroadcastStyle(typeof(da)) isa DimensionalData.DimensionalStyle
 
     @testset "standard case" begin
         @test da .+ da == 2ones(3)