== for Inclusion and affine maps (#105)

* == for Inclusion and affine maps

* Update runtests.jl

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "ContinuumArrays"
 uuid = "7ae1f121-cc2c-504b-ac30-9b923412ae5c"
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/bases/bases.jl

@@ -59,6 +59,8 @@ end
 @inline copy(L::Ldiv{<:AbstractBasisLayout,BroadcastLayout{typeof(+)}}) = +(broadcast(\,Ref(L.A),arguments(L.B))...)
 @inline copy(L::Ldiv{<:AbstractBasisLayout,BroadcastLayout{typeof(+)},<:Any,<:AbstractQuasiVector}) = 
     transform_ldiv(L.A, L.B)
+@inline copy(L::Ldiv{Lay,BroadcastLayout{typeof(+)},<:Any,<:AbstractQuasiVector}) where Lay<:MappedBasisLayouts =
+        copy(Ldiv{Lay,LazyLayout}(L.A,L.B))
 
 @inline function copy(L::Ldiv{<:AbstractBasisLayout,BroadcastLayout{typeof(-)}})
     a,b = arguments(L.B)
@@ -85,7 +87,7 @@ end
     demap(A)\demap(B)
 end
 
-function copy(P::Ldiv{<:MappedBasisLayouts,<:AbstractLazyLayout})
+function copy(P::Ldiv{<:MappedBasisLayouts,<:AbstractLazyLayout,<:Any,<:AbstractQuasiVector})
     A,B = P.A, P.B
     demap(A) \ B[invmap(basismap(A))]
 end

src/maps.jl

@@ -73,6 +73,8 @@ copy(A::AbstractAffineQuasiVector) = A
 inbounds_getindex(A::AbstractAffineQuasiVector{<:Any,<:Any,<:Inclusion}, k::Number) = A.A*k .+ A.b
 isempty(A::AbstractAffineQuasiVector) = isempty(A.x)
 ==(a::AbstractAffineQuasiVector, b::AbstractAffineQuasiVector) = a.A == b.A && a.x == b.x && a.b == b.b
+==(a::AbstractAffineQuasiVector, b::Inclusion) =  a == affine(b,b)
+==(a::Inclusion, b::AbstractAffineQuasiVector) =  affine(a,a) == b
 
 BroadcastStyle(::Type{<:AbstractAffineQuasiVector}) = LazyQuasiArrayStyle{1}()
 
@@ -104,7 +106,6 @@ invmap(d::AbstractAffineQuasiVector) = affine(union(d), axes(d,1))
 
 
 
-
 struct AffineMap{T,D,R} <: AbstractAffineQuasiVector{T,T,D,T}
     domain::D
     range::R

test/runtests.jl

@@ -447,6 +447,10 @@ end
             @test L[y,:] \ (L[y,:] * c) ≈ c
             @test ContinuumArrays.demap(L[y,:] * c) == L*c
         end
+
+        @testset "Mapped and BroadcastLayout{typeof(+)}" begin
+            @test L[y,:] \ (y .+ y) ≈ L[y,:] \ (2y)
+        end
     end
 
     @testset "diff" begin

test/test_maps.jl

@@ -25,6 +25,9 @@ import ContinuumArrays: AffineQuasiVector
         @test_throws BoundsError y[Inclusion(0..2)]
 
         @test y == y
+
+        @test x == affine(x,x)
+        @test affine(x,x) == x
     end
 
     @testset "find" begin