v0.14.3

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "LazyArrays"
 uuid = "5078a376-72f3-5289-bfd5-ec5146d43c02"
-version = "0.14.2"
+version = "0.14.3"
 
 
 [deps]

src/lazyoperations.jl

@@ -59,25 +59,29 @@ function tr(K::Kron{<:Any, 2})
 end
 
 
-getindex(K::Kron{T,1,<:Tuple{<:AbstractVector}}, k::Int) where T =
-    first(K.args)[k]
-
-function getindex(K::Kron{T,1,<:Tuple{<:AbstractVector,<:AbstractVector}}, k::Int) where T
-    A,B = K.args
+kron_getindex((A,)::Tuple{AbstractVector}, k::Integer) = A[k]
+function kron_getindex((A,B)::NTuple{2,AbstractVector}, k::Integer)
     K,κ = divrem(k-1, length(B))
     A[K+1]*B[κ+1]
 end
-
-getindex(K::Kron{T,2,<:Tuple{<:AbstractMatrix}}, k::Int, j::Int) where T =
-    first(K.args)[k,j]
-
-function getindex(K::Kron{T,2,<:Tuple{<:AbstractArray,<:AbstractArray}}, k::Int, j::Int) where T
-    A,B = K.args
+kron_getindex((A,)::Tuple{AbstractMatrix}, k::Integer, j::Integer) = A[k,j]
+function kron_getindex((A,B)::NTuple{2,AbstractArray}, k::Integer, j::Integer)
     K,κ = divrem(k-1, size(B,1))
     J,ξ = divrem(j-1, size(B,2))
     A[K+1,J+1]*B[κ+1,ξ+1]
 end
 
+kron_getindex(args::Tuple, k::Integer, j::Integer) = kron_getindex(tuple(Kron(args[1:2]...), args[3:end]...), k, j)
+kron_getindex(args::Tuple, k::Integer) = kron_getindex(tuple(Kron(args[1:2]...), args[3:end]...), k)
+
+getindex(K::Kron{<:Any,1}, k::Integer) = kron_getindex(K.args, k)
+getindex(K::Kron{<:Any,2}, k::Integer, j::Integer) = kron_getindex(K.args, k, j)
+getindex(K::Applied{DefaultArrayApplyStyle,typeof(kron)}, k::Integer) = kron_getindex(K.args, k)
+getindex(K::Applied{DefaultArrayApplyStyle,typeof(kron)}, k::Integer, j::Integer) = kron_getindex(K.args, k, j)
+
+
+
+
 ## Adapted from julia/stdlib/LinearAlgebra/src/dense.jl kron definition
 function _kron2!(R, K)
     size(R) == size(K) || throw(DimensionMismatch("Matrices have wrong dimensions"))

test/runtests.jl

@@ -104,6 +104,35 @@ include("broadcasttests.jl")
 
     K = @inferred(Kron{Float64}(Eye{Float64}(1), zeros(4)))
     @test Array(K) == zeros(4,1)
+
+    @testset "Applied bug" begin
+        A = randn(5,5)
+        K = Kron(A,A)
+        k = applied(kron,A,A)
+        @test K[1,1] == k[1,1] == A[1,1]^2
+        x = randn(5)
+        K = Kron(A,x)
+        k = applied(kron,A,x)
+        @test K[1,1] == k[1,1] == A[1,1]*x[1]      
+        K = Kron(x,x)
+        k = applied(kron,x,x)
+        @test K[1] == k[1] == x[1]^2
+        K = Kron(A)
+        k = applied(kron,A)
+        @test K[1,1] == k[1,1] == A[1,1]
+        K = Kron(x)
+        k = applied(kron,x)
+        @test K[1] == k[1] == x[1]
+    end
+
+    @testset "triple vector" begin
+        x = randn(5)
+        y = randn(6)
+        z = randn(4)
+        K = Kron(x,y,z)
+        @test K[1] == K[1,1] == x[1]y[1]z[1]
+        @test K == kron(x,y,z)
+    end
 end
 
 @testset "Cache" begin