Better type aliases

Author: mtfishman

src/diagonalarray/delta.jl

@@ -1,8 +1,25 @@
 using FillArrays: AbstractFillVector, Ones, OnesVector
 
-const ScaledDelta{T,N,V<:AbstractFillVector{T},Axes} = DiagonalArray{T,N,V,Axes}
+const ScaledDelta{T,N,Diag<:AbstractFillVector{T},Unstored<:AbstractArray{T,N}} = DiagonalArray{
+  T,N,Diag,Unstored
+}
+const ScaledDeltaVector{T,Diag<:AbstractFillVector{T},Unstored<:AbstractVector{T}} = DiagonalVector{
+  T,Diag,Unstored
+}
+const ScaledDeltaMatrix{T,Diag<:AbstractFillVector{T},Unstored<:AbstractMatrix{T}} = DiagonalMatrix{
+  T,Diag,Unstored
+}
+
+const Delta{T,N,Diag<:OnesVector{T},Unstored<:AbstractArray{T,N}} = DiagonalArray{
+  T,N,Diag,Unstored
+}
+const DeltaVector{T,Diag<:OnesVector{T},Unstored<:AbstractVector{T}} = DiagonalVector{
+  T,Diag,Unstored
+}
+const DeltaMatrix{T,Diag<:OnesVector{T},Unstored<:AbstractMatrix{T}} = DiagonalMatrix{
+  T,Diag,Unstored
+}
 
-const Delta{T,N,V<:OnesVector{T},Axes} = DiagonalArray{T,N,V,Axes}
 function Delta{T}(
   ax::Tuple{AbstractUnitRange{<:Integer},Vararg{AbstractUnitRange{<:Integer}}}
 ) where {T}

src/diagonalarray/diagonalmatrix.jl

@@ -1,11 +1,6 @@
-const DiagonalMatrix{T,Diag,Zero} = DiagonalArray{T,2,Diag,Zero}
-
-function DiagonalMatrix(diag::AbstractVector)
-  return DiagonalArray{<:Any,2}(diag)
-end
-function DiagonalMatrix(diag::AbstractVector, ax::Tuple)
-  return DiagonalArray{<:Any,2}(diag, ax)
-end
+const DiagonalMatrix{T,Diag<:AbstractVector{T},Unstored<:AbstractMatrix{T}} = DiagonalArray{
+  T,2,Diag,Unstored
+}
 
 # LinearAlgebra
 

src/diagonalarray/diagonalvector.jl

@@ -1,4 +1,6 @@
-const DiagonalVector{T,Diag,Zero} = DiagonalArray{T,1,Diag,Zero}
+const DiagonalVector{T,Diag<:AbstractVector{T},Unstored<:AbstractVector{T}} = DiagonalArray{
+  T,1,Diag,Unstored
+}
 
 function DiagonalVector(diag::AbstractVector)
   return DiagonalArray{<:Any,1}(diag)

test/test_basics.jl

@@ -3,9 +3,11 @@ using DerivableInterfaces: permuteddims
 using DiagonalArrays:
   DiagonalArrays,
   Delta,
+  DeltaMatrix,
   DiagonalArray,
   DiagonalMatrix,
   ScaledDelta,
+  ScaledDeltaMatrix,
   δ,
   delta,
   diagindices,
@@ -214,7 +216,9 @@ using LinearAlgebra: Diagonal, mul!
         @test eltype(a) === elt′
         @test diaglength(a) == 2
         @test a isa DiagonalArray{elt′,2}
+        @test a isa DiagonalMatrix{elt′}
         @test a isa Delta{elt′,2}
+        @test a isa DeltaMatrix{elt′}
         @test size(a) == (2, 2)
         @test diaglength(a) == 2
         @test storedlength(a) == 2
@@ -229,7 +233,8 @@ using LinearAlgebra: Diagonal, mul!
         # the diagonal structure properly.
         # https://github.com/ITensor/DiagonalArrays.jl/issues/7
         @test diagview(a′) isa Fill{promote_type(Int, elt′)}
-        @test a′ isa ScaledDelta{promote_type(Int, elt′)}
+        @test a′ isa ScaledDelta{promote_type(Int, elt′),2}
+        @test a′ isa ScaledDeltaMatrix{promote_type(Int, elt′)}
 
         b = randn(elt, (2, 3))
         a_dest = a * b