DiagonalLayout for QuasiDiag (#65)

* DiagonalLayout for QuasiDiag

* Use diagonal

* Update Project.toml

* Update test_quasipermutedims.jl

* Update quasidiagonal.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.5.1"
+version = "0.5.2"
 
 [deps]
 ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
@@ -12,10 +12,10 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-ArrayLayouts = "0.5, 0.6"
+ArrayLayouts = "0.7"
 DomainSets = "0.4"
 FillArrays = "0.11"
-LazyArrays = "0.20, 0.21"
+LazyArrays = "0.21"
 StaticArrays = "1"
 julia = "1.5"
 

src/QuasiArrays.jl

@@ -37,7 +37,7 @@ import LinearAlgebra: transpose, adjoint, checkeltype_adjoint, checkeltype_trans
                         AbstractTriangular, pinv, inv, promote_leaf_eltypes, power_by_squaring,
                         integerpow, schurpow, tr, factorize, copy_oftype, rank
 
-import ArrayLayouts: indextype, concretize, fillzeros, OnesLayout, AbstractFillLayout, FillLayout, ZerosLayout
+import ArrayLayouts: indextype, concretize, fillzeros, OnesLayout, AbstractFillLayout, FillLayout, ZerosLayout, diagonallayout, diagonaldata, diagonal
 import LazyArrays: MemoryLayout, UnknownLayout, Mul, ApplyLayout, BroadcastLayout,
                     InvOrPInv, ApplyStyle, AbstractLazyLayout, LazyLayout,
                     MulStyle, MulAddStyle, LazyArrayApplyStyle, combine_mul_styles, DefaultArrayApplyStyle,

src/quasidiagonal.jl

@@ -35,7 +35,7 @@ julia> QuasiDiagonal(A)
 """
 QuasiDiagonal(A::AbstractQuasiMatrix) = QuasiDiagonal(diag(A))
 
-@deprecate Diagonal(A::AbstractQuasiArray) QuasiDiagonal(A)
+@deprecate Diagonal(A::AbstractQuasiArray) diagonal(A)
 
 
 """
@@ -202,4 +202,8 @@ end
 
 permutedims(D::QuasiDiagonal) = D
 inv(D::QuasiDiagonal) = QuasiDiagonal(inv.(D.diag))
-copy(D::QuasiDiagonal) = QuasiDiagonal(copy(D.diag))
+copy(D::QuasiDiagonal) = QuasiDiagonal(copy(D.diag))
+
+MemoryLayout(::Type{<:QuasiDiagonal{<:Any,V}}) where V = diagonallayout(MemoryLayout(V))
+diagonaldata(D::QuasiDiagonal) = D.diag
+diagonal(d::AbstractQuasiVector) = QuasiDiagonal(d)

src/quasipermutedims.jl

@@ -70,6 +70,8 @@ end
 # end
 
 permutedims(A::AbstractQuasiMatrix) = PermutedDimsQuasiArray(A, (2,1))
+permutedims(v::AbstractQuasiVector{<:Real}) = v'
+permutedims(v::AbstractQuasiVector{<:Number}) = transpose(v)
 # permutedims(v::AbstractQuasiVector) = reshape(v, (1, length(v)))
 
 # function Base.showarg(io::IO, A::PermutedDimsQuasiArray{T,N,perm}, toplevel) where {T,N,perm}

test/test_matmul.jl

@@ -1,14 +1,18 @@
-using QuasiArrays, Test
+using QuasiArrays, ArrayLayouts, Test
 import QuasiArrays: apply
 
 @testset "Multiplication" begin
     @testset "Diag * Inclusion" begin
         A = QuasiDiagonal(Inclusion(0:0.1:1))
+        @test rowsupport(A,0.1) == colsupport(A,0.1) == 0.1
         b = Inclusion(0:0.1:1)
         Ab = A*b
         @test Ab isa QuasiArray
         @test Ab[0.1] ≈ 0.1^2
         @test_throws DimensionMismatch A*Inclusion(1:2)
+
+        @test A*A isa QuasiDiagonal
+        @test (A*A)[0.1,0.1] ≈ A[0.1,0.1]^2
     end
     @testset "Quasi * Quasi" begin
         A = QuasiArray(rand(3,3),(0:0.5:1,0:0.5:1))

test/test_quasipermutedims.jl

@@ -17,4 +17,10 @@ using QuasiArrays, LinearAlgebra, Test
         D = Diagonal(view(A, 0.0, [1,4]))
         @test permutedims(D) ≡ D
     end
+
+    @testset "vec" begin
+        a = QuasiVector(randn(3),[0,2,3])
+        @test permutedims(a) == a'
+        @test permutedims(a .+ im) == transpose(a .+ im)
+    end
 end