diff --git a/Project.toml b/Project.toml index 3cf03b3..f4d4af3 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "InfiniteArrays" uuid = "4858937d-0d70-526a-a4dd-2d5cb5dd786c" -version = "0.15.6" +version = "0.15.7" [deps] ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a" diff --git a/src/infrange.jl b/src/infrange.jl index 62c34bc..b551551 100644 --- a/src/infrange.jl +++ b/src/infrange.jl @@ -488,12 +488,12 @@ BroadcastStyle(::Type{<:SubArray{<:Any,2,<:Any,<:Tuple{<:Any,<:InfIndexRanges}}} -broadcasted(::BroadcastStyle, f, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,parent(r))' -broadcasted(::BroadcastStyle, f, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,parent(r))) -broadcasted(::BroadcastStyle, f, a::Number, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,a,parent(r))' -broadcasted(::BroadcastStyle, f, a::Number, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,a,parent(r))) -broadcasted(::BroadcastStyle, f, r::Adjoint{<:Any,<:InfRanges}, a::Number) = broadcast(f,parent(r),a)' -broadcasted(::BroadcastStyle, f, r::Transpose{<:Any,<:InfRanges}, a::Number) = transpose(broadcast(f,parent(r),a)) +broadcasted(::LazyArrayStyle, f, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,parent(r))' +broadcasted(::LazyArrayStyle, f, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,parent(r))) +broadcasted(::LazyArrayStyle, f, a::Number, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,a,parent(r))' +broadcasted(::LazyArrayStyle, f, a::Number, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,a,parent(r))) +broadcasted(::LazyArrayStyle, f, r::Adjoint{<:Any,<:InfRanges}, a::Number) = broadcast(f,parent(r),a)' +broadcasted(::LazyArrayStyle, f, r::Transpose{<:Any,<:InfRanges}, a::Number) = transpose(broadcast(f,parent(r),a)) broadcast(f, r::Adjoint{<:Any,<:InfRanges}) = broadcast(f,parent(r))' broadcast(f, r::Transpose{<:Any,<:InfRanges}) = transpose(broadcast(f,parent(r))) diff --git a/test/runtests.jl b/test/runtests.jl index 1b15555..4175094 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -898,13 +898,13 @@ end @testset "views of matrices" begin D = Diagonal(1:∞) V = Vcat(Ones(2,∞), D) - @test view(D,:,5) .+ 1 isa BroadcastVector - @test view(D,5,:) .+ 1 isa BroadcastVector - @test view(V,:,5) .+ 1 isa BroadcastVector - @test view(V,5,:) .+ 1 isa BroadcastVector + @test view(D,:,5) .+ 1 isa BroadcastVector || view(D,:,5) .+ 1 isa CachedArray + @test view(D,5,:) .+ 1 isa BroadcastVector || view(D,5,:) .+ 1 isa CachedArray + @test view(V,:,5) .+ 1 isa BroadcastVector || view(V,:,5) .+ 1 isa Vcat + @test view(V,5,:) .+ 1 isa BroadcastVector || view(V,5,:) .+ 1 isa Vcat @test view(D,2:∞,2:∞) .+ 1 isa BroadcastMatrix - @test view(V,2:∞,2:∞) .+ 1 isa BroadcastMatrix + @test view(V,2:∞,2:∞) .+ 1 isa BroadcastMatrix || view(V,2:∞,2:∞) .+ 1 isa Vcat @test view(D,2:∞,[1,2,3]) .+ 1 isa BroadcastMatrix @test view(D,[1,2,3],2:∞) .+ 1 isa BroadcastMatrix