== for sub array (#73)

* == for sub array

* fix tests

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "QuasiArrays"
 uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
 authors = ["Sheehan Olver <[email protected]>"]
-version = "0.6"
+version = "0.7"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -13,7 +13,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
 ArrayLayouts = "0.7"
-DomainSets = "0.4, 0.5"
+DomainSets = "0.5"
 FillArrays = "0.11, 0.12"
 LazyArrays = "0.21.5"
 StaticArrays = "1"

src/quasikron.jl

@@ -25,7 +25,7 @@ _kronaxes(::Tuple{}...) = ()
 _kronaxes(a::Tuple...) = (quasikron(map(first,a)...), _kronaxes(map(tail,a)...)...)
 axes(K::QuasiKron) = _kronaxes(map(axes,K.args)...)
 
-function getindex(K::QuasiKron{<:Any,1}, i::Tuple)
-    @boundscheck checkbounds(K, i)
-    prod(getindex.(K.args,i))
+function _getindex(::Type{IND}, K::QuasiKron{<:Any,1}, i::IND) where IND
+    @boundscheck checkbounds(K, i...)
+    prod(getindex.(K.args,i...))
 end

src/subquasiarray.jl

@@ -341,3 +341,18 @@ function summary(io::IO, v::SubQuasiArray)
     print(io, " with eltype ", eltype(v))
 end
 
+function (==)(A::SubQuasiArray, B::AbstractQuasiArray)
+    parentindices(A) == axes(parent(A)) && return parent(A) == B
+    Base.invoke(==, NTuple{2,AbstractQuasiArray}, A, B)
+end
+
+function (==)(A::AbstractQuasiArray, B::SubQuasiArray)
+    parentindices(B) == axes(parent(B)) && return A == parent(B)
+    Base.invoke(==, NTuple{2,AbstractQuasiArray}, A, B)
+end
+
+function (==)(A::SubQuasiArray, B::SubQuasiArray)
+    parentindices(A) == axes(parent(A)) && return parent(A) == B
+    parentindices(B) == axes(parent(B)) && return A == parent(B)
+    Base.invoke(==, NTuple{2,AbstractQuasiArray}, A, B)
+end

test/test_quasikron.jl

@@ -1,23 +1,23 @@
-using QuasiArrays, DomainSets, Test
+using QuasiArrays, DomainSets, StaticArrays, Test
 
 @testset "Kron" begin
     @testset "InclusionKron" begin
         a = Inclusion(0:0.5:2)
         b = Inclusion([1,3,4])
         c = quasikron(a,b)
-        @test eltype(c) == Tuple{Float64,Int}
-        @test c[(0.5,3)] == (0.5,3)
-        @test_throws BoundsError c[(0.6,3)]
-        @test_throws BoundsError c[(0.5,2)]
+        @test eltype(c) == SVector{2,Float64}
+        @test c[SVector(0.5,3)] == SVector(0.5,3)
+        @test_throws BoundsError c[SVector(0.6,3)]
+        @test_throws BoundsError c[SVector(0.5,2)]
     end
 
     @testset "QuasiKron" begin
         a = QuasiVector(randn(5), 0:0.5:2)
         b = QuasiVector([5,6,8], [1,3,4])
         K = quasikron(a, b)
         @test axes(K) == (quasikron(axes(a,1),axes(b,1)),)
-        @test K[(0.5,3)] == a[0.5]b[3]
-        @test_throws BoundsError K[(0.6,3)]
-        @test_throws BoundsError K[(0.5,2)]
+        @test K[SVector(0.5,3)] == a[0.5]b[3]
+        @test_throws BoundsError K[SVector(0.6,3)]
+        @test_throws BoundsError K[SVector(0.5,2)]
     end
 end

test/test_quasisubarray.jl

@@ -302,4 +302,17 @@ using QuasiArrays, Base64, Test
         v = view(a, :)
         @test stringmime("text/plain", v) == "view(QuasiVector{Float64, Tuple{StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}}}, Inclusion(0.0:0.5:1.0)) with eltype Float64"
     end
+
+    @testset "==" begin
+        A = QuasiArray(randn(3,3),(0:0.5:1,1:0.5:2))
+        B = QuasiArray(randn(4,3),(0:0.5:1.5,1:0.5:2))
+        @test A == view(A,:,:)
+        @test view(A,:,:) == A
+        @test view(A,:,:) == view(A,:,:)
+        @test A ≠ view(A,Inclusion(0:0.5:0.5),:)
+        @test view(A,Inclusion(0:0.5:0.5),:) ≠ A
+        @test A ≠ view(B,Inclusion(0:0.5:1),:)
+        @test view(B,Inclusion(0:0.5:1),:) ≠ A
+        @test view(B,Inclusion(0:0.5:1),:) ≠ view(A,Inclusion(0:0.5:0.5),:)
+    end
 end