Add Diagonal[{T}](S::UniformScaling, n) constructors.

JuliaLang · Oct 31, 2017 · e05b794 · e05b794
1 parent b739018
commit e05b794
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/base/linalg/uniformscaling.jl b/base/linalg/uniformscaling.jl
@@ -371,3 +371,7 @@ UniformScaling{Float64}
 ```
 """
 chol(J::UniformScaling, args...) = ((C, info) = _chol!(J, nothing); @assertposdef C info)
+
+## Diagonal construction from UniformScaling
+Diagonal{T}(s::UniformScaling, m::Integer) where {T} = Diagonal{T}(fill(T(s.λ), m))
+Diagonal(s::UniformScaling, m::Integer) where {T} = Diagonal{eltype(s)}(s, m)
diff --git a/test/linalg/uniformscaling.jl b/test/linalg/uniformscaling.jl
@@ -216,3 +216,10 @@ end
     @test alltwos != 2I != alltwos # test generic path / inequality off diag
     @test rdenseI !=  I != rdenseI # test square matrix check
 end
+
+@testset "Diagonal construction from UniformScaling" begin
+    @test Diagonal(2I, 3)::Diagonal{Int} == 2*eye(3)
+    @test Diagonal(2.0I, 3)::Diagonal{Float64} == 2*eye(3)
+    @test Diagonal{Real}(2I, 3)::Diagonal{Real} == 2*eye(3)
+    @test Diagonal{Float64}(2I, 3)::Diagonal{Float64} == 2*eye(3)
+end