add constructors from UniformScaling, to replace eye

Author: fredrikekre

src/MArray.jl

@@ -82,6 +82,9 @@ end
 @inline one(::Type{MArray{S,T}}) where {S,T} = one(MArray{S,T,tuple_length(S)})
 @inline eye(::Type{MArray{S,T}}) where {S,T} = eye(MArray{S,T,tuple_length(S)})
 
+# MArray(I::UniformScaling) methods to replace eye
+(::Type{MA})(I::UniformScaling) where {MA<:MArray} = _eye(Size(MA), MA, I)
+
 ####################
 ## MArray methods ##
 ####################

src/SArray.jl

@@ -61,6 +61,9 @@ end
 @inline one(::Type{SArray{S, T}}) where {S, T} = one(SArray{S, T, tuple_length(S)})
 @inline eye(::Type{SArray{S, T}}) where {S, T} = eye(SArray{S, T, tuple_length(S)})
 
+# SArray(I::UniformScaling) methods to replace eye
+(::Type{SA})(I::UniformScaling) where {SA<:SArray} = _eye(Size(SA), SA, I)
+
 ####################
 ## SArray methods ##
 ####################

src/SDiagonal.jl

@@ -82,6 +82,9 @@ function logdet(D::SDiagonal{N,T}) where {N,T<:Complex} #Make sure branch cut is
 end
 
 eye(::Type{SDiagonal{N,T}}) where {N,T} = SDiagonal(ones(SVector{N,T}))
+# SDiagonal(I::UniformScaling) methods to replace eye
+(::Type{SD})(I::UniformScaling) where {N,SD<:SDiagonal{N}} = SD(ntuple(x->I.λ, Val(N)))
+
 one(::Type{SDiagonal{N,T}}) where {N,T} = SDiagonal(ones(SVector{N,T}))
 one(::SDiagonal{N,T}) where {N,T} = SDiagonal(ones(SVector{N,T}))
 Base.zero(::SDiagonal{N,T}) where {N,T} = SDiagonal(zeros(SVector{N,T}))

src/linalg.jl

@@ -169,20 +169,17 @@ end
     @deprecate eye(A::SM) where {SM<:StaticMatrix} eye(typeof(A))
 end
 
-#if VERSION < v"0.7-"
-    @inline eye(::Type{SM}) where {SM <: StaticMatrix} = _eye(Size(SM), SM)
-    @generated function _eye(::Size{S}, ::Type{SM}) where {S, SM <: StaticArray}
-        T = eltype(SM) # should be "hyperpure"
-        if T == Any
-            T = Float64
-        end
-        exprs = [i == j ? :(one($T)) : :(zero($T)) for i ∈ 1:S[1], j ∈ 1:S[2]]
-        return quote
-            $(Expr(:meta, :inline))
-            SM(tuple($(exprs...)))
-        end
+# StaticMatrix(I::UniformScaling) methods to replace eye
+(::Type{SM})(I::UniformScaling) where {N,M,SM<:StaticMatrix{N,M}} = _eye(Size(SM), SM, I)
+
+@inline eye(::Type{SM}) where {SM<:StaticMatrix} = _eye(Size(SM), SM, 1.0I)
+@generated function _eye(::Size{S}, ::Type{SM}, I::UniformScaling{T}) where {S, SM <: StaticArray, T}
+    exprs = [i == j ? :(I.λ) : :(zero($T)) for i ∈ 1:S[1], j ∈ 1:S[2]]
+    return quote
+        $(Expr(:meta, :inline))
+        SM(tuple($(exprs...)))
     end
-#end
+end
 
 @generated function diagm(kvs::Pair{<:Val,<:StaticVector}...)
     N = maximum(abs(kv.parameters[1].parameters[1]) + length(kv.parameters[2]) for kv in kvs)

test/MArray.jl

@@ -127,9 +127,9 @@
             @test !Base.mightalias(m, copy(m))
             @test Base.mightalias(m, view(m, :, 1))
         end
-        
+
         if isdefined(Base, :dataids) # v0.7-
-            @test Base.dataids(m) == (UInt(pointer(m)),) 
+            @test Base.dataids(m) == (UInt(pointer(m)),)
         end
     end
 

test/SArray.jl

@@ -43,7 +43,7 @@
         @test ((@SArray [i*j*k*l for i = 1:2, j = 2:3, k = 3:4, l = 1:2])::SArray{Tuple{2,2,2,2}}).data === (6, 12, 9, 18, 8, 16, 12, 24, 12, 24, 18, 36, 16, 32, 24, 48)
         @test ((@SArray [i*j*k*l*m for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2])::SArray{Tuple{2,2,2,2,2}}).data === (6, 12, 9, 18, 8, 16, 12, 24, 12, 24, 18, 36, 16, 32, 24, 48, 2*6, 2*12, 2*9, 2*18, 2*8, 2*16, 2*12, 2*24, 2*12, 2*24, 2*18, 2*36, 2*16, 2*32, 2*24, 2*48)
         @test ((@SArray [1 for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2, n = 1:2])::SArray{Tuple{2,2,2,2,2,2}}).data === ntuple(i->1, 64)
-        @test ((@SArray [1 for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2, n = 1:2, o = 1:2])::SArray{Tuple{2,2,2,2,2,2,2}}).data === ntuple(i->1, 128) 
+        @test ((@SArray [1 for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2, n = 1:2, o = 1:2])::SArray{Tuple{2,2,2,2,2,2,2}}).data === ntuple(i->1, 128)
         @test ((@SArray [1 for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2, n = 1:2, o = 1:2, p = 1:2])::SArray{Tuple{2,2,2,2,2,2,2,2}}).data === ntuple(i->1, 256)
         test_expand_error(:(@SArray [1 for i = 1:2, j = 2:3, k = 3:4, l = 1:2, m = 1:2, n = 1:2, o = 1:2, p = 1:2, q = 1:2]))
         @test ((@SArray Float64[i for i = 1:2])::SArray{Tuple{2}}).data === (1.0, 2.0)

test/linalg.jl

@@ -39,6 +39,40 @@ using StaticArrays, Test, LinearAlgebra
         @test @inferred(I \ @SMatrix([0 1; 2 3])) === @SMatrix [0.0 1.0; 2.0 3.0]
     end
 
+    @testset "Constructors from UniformScaling" begin
+        I3x3 = Matrix(I, 3, 3)
+        I3x2 = Matrix(I, 3, 2)
+        # SArray
+        ## eltype from I
+        @test @inferred(SArray{Tuple{3,3}}(I))::SMatrix{3,3,Bool,9} == I3x3
+        @test @inferred(SArray{Tuple{3,3}}(2.0I))::SMatrix{3,3,Float64,9} == 2I3x3
+        ## eltype from constructor
+        @test @inferred(SArray{Tuple{3,3},Float64}(I))::SMatrix{3,3,Float64,9} == I3x3
+        @test @inferred(SArray{Tuple{3,3},Float32}(2.0I))::SMatrix{3,3,Float32,9} == 2I3x3
+        ## non-square
+        @test @inferred(SArray{Tuple{3,2}}(I))::SMatrix{3,2,Bool,6} == I3x2
+        # SMatrix
+        @test @inferred(SMatrix{3,3}(I))::SMatrix{3,3,Bool,9} == I3x3
+        @test @inferred(SMatrix{3,3}(2.0I))::SMatrix{3,3,Float64,9} == 2I3x3
+        # MArray
+        ## eltype from I
+        @test @inferred(MArray{Tuple{3,3}}(I))::MMatrix{3,3,Bool,9} == I3x3
+        @test @inferred(MArray{Tuple{3,3}}(2.0I))::MMatrix{3,3,Float64,9} == 2I3x3
+        ## eltype from constructor
+        @test @inferred(MArray{Tuple{3,3},Float64}(I))::MMatrix{3,3,Float64,9} == I3x3
+        @test @inferred(MArray{Tuple{3,3},Float32}(2.0I))::MMatrix{3,3,Float32,9} == 2I3x3
+        ## non-square
+        @test @inferred(MArray{Tuple{3,2}}(I))::MMatrix{3,2,Bool,6} == I3x2
+        # MMatrix
+        @test @inferred(MMatrix{3,3}(I))::MMatrix{3,3,Bool,9} == I3x3
+        @test @inferred(MMatrix{3,3}(2.0I))::MMatrix{3,3,Float64,9} == 2I3x3
+        # SDiagonal
+        @test @inferred(SDiagonal{3}(I))::SDiagonal{3,Bool} == I3x3
+        @test @inferred(SDiagonal{3}(2.0I))::SDiagonal{3,Float64} == 2I3x3
+        @test @inferred(SDiagonal{3,Float64}(I))::SDiagonal{3,Float64} == I3x3
+        @test @inferred(SDiagonal{3,Float32}(2.0I))::SDiagonal{3,Float32} == 2I3x3
+    end
+
     @testset "diagm()" begin
         @test @inferred(diagm(Val(0) => SVector(1,2))) === @SMatrix [1 0; 0 2]
         @test @inferred(diagm(Val(2) => SVector(1,2,3)))::SMatrix == diagm(2 => [1,2,3])