Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some (matrix) functions for UniformScaling #28872

Merged
merged 25 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions stdlib/LinearAlgebra/src/uniformscaling.jl
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ ishermitian(J::UniformScaling) = isreal(J.λ)
(-)(J::UniformScaling, x::Number) = J.λ - x
(-)(x::Number, J::UniformScaling) = x - J.λ

(^)(J::UniformScaling, x::Number) = UniformScaling(J.λ ^ x)

(+)(J1::UniformScaling, J2::UniformScaling) = UniformScaling(J1.λ+J2.λ)
(+)(B::BitArray{2}, J::UniformScaling) = Array(B) + J
(+)(J::UniformScaling, B::BitArray{2}) = J + Array(B)
Expand All @@ -95,6 +97,20 @@ ishermitian(J::UniformScaling) = isreal(J.λ)
(-)(J::UniformScaling, B::BitArray{2}) = J - Array(B)
(-)(A::AbstractMatrix, J::UniformScaling) = A + (-J)

# matrix functions
for f in ( :exp, :log,
:sqrt,
:sin, :cos, :tan,
:asin, :acos, :atan,
:csc, :sec, :cot,
:acsc, :asec, :acot,
:sinh, :cosh, :tanh,
:asinh, :acosh, :atanh,
:csch, :sech, :coth,
:acsch, :asech, :acoth )
@eval $f(J::UniformScaling) = UniformScaling($f(J.λ))
end

# Unit{Lower/Upper}Triangular matrices become {Lower/Upper}Triangular under
# addition with a UniformScaling
for (t1, t2) in ((:UnitUpperTriangular, :UpperTriangular),
Expand Down Expand Up @@ -168,6 +184,10 @@ Broadcast.broadcasted(::typeof(*), J::UniformScaling,x::Number) = UniformScaling

Broadcast.broadcasted(::typeof(/), J::UniformScaling,x::Number) = UniformScaling(J.λ/x)

Broadcast.broadcasted(::typeof(\), x::Number,J::UniformScaling) = UniformScaling(x\J.λ)

Broadcast.broadcasted(::typeof(^), J::UniformScaling,x::Number) = UniformScaling(J.λ^x)

==(J1::UniformScaling,J2::UniformScaling) = (J1.λ == J2.λ)

## equality comparison with UniformScaling
Expand Down
20 changes: 20 additions & 0 deletions stdlib/LinearAlgebra/test/uniformscaling.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ Random.seed!(123)
@test opnorm(UniformScaling(1+im)) ≈ sqrt(2)
end

@testset "exp, log, and trigonometric functions" begin
# on complex plane
J = UniformScaling(randn(ComplexF64))
# convert to a dense matrix with random size
M = (N = rand(1:0x678); Matrix(J, N, N))
for f in ( exp, log,
sin, cos, tan,
asin, acos, atan,
csc, sec, cot,
acsc, asec, acot,
sinh, cosh, tanh,
asinh, acosh, atanh,
csch, sech, coth,
acsch, asech, acoth )
@test f(J) ≈ f(M)
end
end

@testset "conjugation of UniformScaling" begin
@test conj(UniformScaling(1))::UniformScaling{Int} == UniformScaling(1)
@test conj(UniformScaling(1.0))::UniformScaling{Float64} == UniformScaling(1.0)
Expand Down Expand Up @@ -55,8 +73,10 @@ end
@test I - α == 1 - α
@test α .* UniformScaling(1.0) == UniformScaling(1.0) .* α
@test UniformScaling(α)./α == UniformScaling(1.0)
@test α.\UniformScaling(α) == UniformScaling(1.0)
@test α * UniformScaling(1.0) == UniformScaling(1.0) * α
@test UniformScaling(α)/α == UniformScaling(1.0)
@test (2I)^α == (2I).^α == (2^α)I
end

@testset "det and logdet" begin
Expand Down