Support hcat with non-number indexing (#122)

* Support hcat with non-number indexing

* add tests

* Update QuasiArrays.jl

* Update test_quasiconcat.jl

* Update test_quasiconcat.jl

Author: dlfivefifty

Project.toml

@@ -1,7 +1,7 @@
 name = "QuasiArrays"
 uuid = "c4ea9172-b204-11e9-377d-29865faadc5c"
 authors = ["Sheehan Olver <solver@mac.com>"]
-version = "0.13"
+version = "0.13.1"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"

src/QuasiArrays.jl

@@ -78,7 +78,8 @@ const AbstractQuasiOrArray{T} = Union{AbstractArray{T},AbstractQuasiArray{T}}
 
 
 cardinality(d) = length(d)
-cardinality(d::UnionDomain) = +(cardinality.(d.domains)...)
+cardinality(d::UnionDomain) = sum(cardinality, d.domains)
+cardinality(d::VcatDomain) = prod(cardinality, d.domains)
 
 size(A::AbstractQuasiArray) = map(cardinality, axes(A))
 axes(A::AbstractQuasiArray) = error("Override axes for $(typeof(A))")

src/quasiconcat.jl

@@ -13,11 +13,11 @@ _vecormat_getindex(A::AbstractQuasiVector,k,ξ) = A[k]
 # TODO: generalize
 @inline LazyArrays._view_hcat(a::AbstractQuasiVector, kr::Number, jr) = a[kr]
 
-function getindex(f::ApplyQuasiMatrix{T,typeof(hcat)}, k::Number, j::Number) where T
+function _getindex(::Type{IND}, f::ApplyQuasiMatrix{T,typeof(hcat)}, (k,j)::IND) where {T,IND}
     ξ = j
     for A in f.args
         n = size(A,2)
-        ξ ≤ n && return T(_vecormat_getindex(A,k,ξ))::T
+        ξ ≤ n && return T(_vecormat_getindex(A,k,ξ))::T
         ξ -= n
     end
     throw(BoundsError(f, (k,j)))

test/test_quasiconcat.jl

@@ -1,5 +1,5 @@
 using QuasiArrays, DomainSets, Test
-import QuasiArrays: ApplyQuasiMatrix, UnionVcat
+import QuasiArrays: ApplyQuasiMatrix, UnionVcat, cardinality
 
 @testset "Concatenation" begin
     @testset "Hcat" begin
@@ -9,7 +9,7 @@ import QuasiArrays: ApplyQuasiMatrix, UnionVcat
         @test axes(B) == (axes(A,1), Base.OneTo(4))
         @test B[0.0,1] == B[0.0,3] == A[0.0,1]
         @test B == B
-        @test B ≠ A
+        @test B ≠ A
         @test B ≠ [A A A]
         @test_throws BoundsError B[0.1,1]
         @test_throws BoundsError B[0.0,5]
@@ -36,8 +36,11 @@ import QuasiArrays: ApplyQuasiMatrix, UnionVcat
             b = QuasiVector([5,6,8], [1,3,4])
             c = UnionVcat(a,b)
             @test axes(c,1) == Inclusion(union(0:0.5:2, [1,3,4]))
+            @test cardinality(axes(c,1)) == length(c) == 7
             @test c[0.5] ≡ a[0.5]
             @test c[3] ≡ c[3.0] ≡ 6.0
+            @test c[1] == a[1] # first 
+            @test cardinality(UnionDomain(0:0.5:2, 3:5)) == 8
             @test_throws BoundsError c[2.5]
         end
         @testset "matrix" begin

test/test_quasikron.jl

@@ -10,6 +10,13 @@ import QuasiArrays: ArrayQuasiVector
         @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)]
+        @testset "Hcat" begin
+            H = [first.(c) last.(c)]
+            @test H[SVector(0.5,3),1] == 0.5
+            @test H[SVector(0.5,3),1:2] == H[SVector(0.5,3),:] == [0.5, 3]
+            @test H[[SVector(0.5,3),SVector(1,4)],1] == [0.5,1]
+            @test H[[SVector(0.5,3),SVector(1,4)],1:2] == H[[SVector(0.5,3),SVector(1,4)],:] == [0.5 3; 1 4]
+        end
     end
 
     @testset "QuasiKron" begin