lower to standard broadcast for PseudoBlockArray (#193)

* lower to standard broadcast for PseudoBlockArray

* Update blockbroadcast.jl

* Update blockbroadcast.jl

* Update test_blockbroadcast.jl

* Update test_blockbroadcast.jl

* v0.16.8

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "BlockArrays"
 uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e"
-version = "0.16.7"
+version = "0.16.8"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/blockbroadcast.jl

@@ -220,11 +220,19 @@ function copyto!(dest::AbstractVector,
     end
     return _fast_blockbradcast_copyto!(dest, bc)
 end
-@inline function Broadcast.instantiate(bc::Broadcasted{Style}) where {Style <:AbstractBlockStyle}
+@inline function Broadcast.instantiate(bc::Broadcasted{Style}) where {Style <:BlockStyle}
     bcf = Broadcast.instantiate(Broadcast.flatten(Broadcasted{Nothing}(bc.f, bc.args, bc.axes)))
     return Broadcasted{Style}(bcf.f, bcf.args, bcf.axes)
 end
 
+_removeblocks(a::Broadcasted) = broadcasted(a.f, map(_removeblocks,a.args)...)
+_removeblocks(a::PseudoBlockArray) = a.blocks
+_removeblocks(a::BlockSlice) = a.indices
+_removeblocks(a::Adjoint) = _removeblocks(parent(a))'
+_removeblocks(a::Transpose) = transpose(_removeblocks(parent(a)))
+_removeblocks(a::SubArray{<:Any,N,<:PseudoBlockArray}) where N = view(_removeblocks(parent(a)), map(_removeblocks, parentindices(a))...)
+_removeblocks(a) = a
+copy(bc::Broadcasted{PseudoBlockStyle{N}}) where N = PseudoBlockArray(materialize(_removeblocks(bc)), axes(bc))
 
 for op in (:+, :-, :*)
     @eval function copy(bc::Broadcasted{BlockStyle{N},<:Any,typeof($op),<:Tuple{<:AbstractArray{<:Number,N}}}) where N

test/test_blockbroadcast.jl

@@ -50,6 +50,13 @@ import BlockArrays: SubBlockIterator, BlockIndexRange, Diagonal
         @test axes(B .+ 1) == axes(B)
         @test axes(A .+ 1 .+ B) == axes(B)
         @test A .+ 1 .+ B == Vector(A) .+ 1 .+ B == Vector(A) .+ 1 .+ Matrix(B)
+
+        @testset "preserve structure" begin
+             x = PseudoBlockArray(1:6, Fill(3,2))
+             @test x + x isa PseudoBlockVector{Int,<:AbstractRange}
+             @test 2x + x isa PseudoBlockVector{Int,<:AbstractRange}
+             @test 2 .* (x .+ 1) isa PseudoBlockVector{Int,<:AbstractRange}
+        end
     end
 
     @testset "Mixed" begin
@@ -184,9 +191,11 @@ import BlockArrays: SubBlockIterator, BlockIndexRange, Diagonal
         @test Base.BroadcastStyle(typeof(a')) isa BlockArrays.PseudoBlockStyle{2}
         @test Base.BroadcastStyle(typeof(b')) isa BlockArrays.BlockStyle{2}
 
-        @test exp.(a') == exp.(b') == exp.(Vector(a)')
+        @test exp.(a') == exp.(b') == exp.(transpose(a)) == exp.(transpose(b)) == exp.(Vector(a)')
         @test exp.(a') isa PseudoBlockArray
+        @test exp.(transpose(a)) isa PseudoBlockArray
         @test exp.(b') isa BlockArray
+        @test exp.(transpose(b)) isa BlockArray
     end
 
     @testset "subarray" begin