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.

Sign up for GitHub

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

Fix matrix trig functions for matrices of integers #24180

Merged
merged 3 commits into from
Oct 23, 2017
Merged

Fix matrix trig functions for matrices of integers #24180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5056f5
Convert integers to float in matrix trig functions
Oct 17, 2017
8008ec6
Add tests
Oct 17, 2017
1ccecc9
Dots!
Oct 23, 2017
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
30 changes: 18 additions & 12 deletions base/linalg/dense.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,14 +718,16 @@ function cos(A::AbstractMatrix{<:Real})
if issymmetric(A)
return full(cos(Symmetric(A)))
end
return real(exp!(im*A))
T = complex(float(eltype(A)))
return real(exp!(T.(im .* A)))
end
function cos(A::AbstractMatrix{<:Complex})
if ishermitian(A)
return full(cos(Hermitian(A)))
end
X = exp!(im*A)
X .= (X .+ exp!(-im*A)) ./ 2
T = complex(float(eltype(A)))
X = exp!(T.(im .* A))
@. X = (X + $exp!(T(-im*A))) / 2
return X
end

Expand All @@ -749,14 +751,16 @@ function sin(A::AbstractMatrix{<:Real})
if issymmetric(A)
return full(sin(Symmetric(A)))
end
return imag(exp!(im*A))
T = complex(float(eltype(A)))
return imag(exp!(T.(im .* A)))
end
function sin(A::AbstractMatrix{<:Complex})
if ishermitian(A)
return full(sin(Hermitian(A)))
end
X = exp!(im*A)
Y = exp!(-im*A)
T = complex(float(eltype(A)))
X = exp!(T.(im .* A))
Y = exp!(T.(.-im .* A))
@inbounds for i in eachindex(X)
x, y = X[i]/2, Y[i]/2
X[i] = Complex(imag(x)-imag(y), real(y)-real(x))
Expand Down Expand Up @@ -788,15 +792,17 @@ function sincos(A::AbstractMatrix{<:Real})
if issymmetric(A)
return full.(sincos(Symmetric(A)))
end
c, s = reim(exp!(im*A))
T = complex(float(eltype(A)))
c, s = reim(exp!(T.(im .* A)))
return s, c
end
function sincos(A::AbstractMatrix{<:Complex})
if ishermitian(A)
return full.(sincos(Hermitian(A)))
end
X = exp!(im*A)
Y = exp!(-im*A)
T = complex(float(eltype(A)))
X = exp!(T.(im .* A))
Y = exp!(T.(.-im .* A))
@inbounds for i in eachindex(X)
x, y = X[i]/2, Y[i]/2
X[i] = Complex(imag(x)-imag(y), real(y)-real(x))
Expand Down Expand Up @@ -840,7 +846,7 @@ function cosh(A::AbstractMatrix)
return full(cosh(Hermitian(A)))
end
X = exp(A)
X .= (X .+ exp!(-A)) ./ 2
@. X = (X + $exp!(float(-A))) / 2
return X
end

Expand All @@ -854,7 +860,7 @@ function sinh(A::AbstractMatrix)
return full(sinh(Hermitian(A)))
end
X = exp(A)
X .= (X .- exp!(-A)) ./ 2
@. X = (X - $exp!(float(-A))) / 2
return X
end

Expand All @@ -868,7 +874,7 @@ function tanh(A::AbstractMatrix)
return full(tanh(Hermitian(A)))
end
X = exp(A)
Y = exp!(-A)
Y = exp!(float.(.-A))
@inbounds for i in eachindex(X)
x, y = X[i], Y[i]
X[i] = x - y
Expand Down
21 changes: 21 additions & 0 deletions test/linalg/dense.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,27 @@ end
@test sinh(A5) ≈ 0.5 * (exp(A5) - exp(-A5))
end

@testset "Additional tests for $elty" for elty in (Int32, Int64, Complex{Int32}, Complex{Int64})
A1 = convert(Matrix{elty}, [1 2; 3 4])
A2 = convert(Matrix{elty}, [1 2; 2 1])

cosA1 = convert(Matrix{float(elty)}, [0.855423165077998 -0.11087638101074865;
-0.16631457151612294 0.689108593561875])
cosA2 = convert(Matrix{float(elty)}, [-0.22484509536615283 -0.7651474012342925;
-0.7651474012342925 -0.22484509536615283])

@test cos(A1) ≈ cosA1
@test cos(A2) ≈ cosA2

sinA1 = convert(Matrix{float(elty)}, [-0.46558148631373036 -0.14842445991317652;
-0.22263668986976476 -0.6882181761834951])
sinA2 = convert(Matrix{float(elty)}, [-0.3501754883740146 0.4912954964338818;
0.4912954964338818 -0.3501754883740146])

@test sin(A1) ≈ sinA1
@test sin(A2) ≈ sinA2
end

@testset "Inverse functions for $elty" for elty in (Float32, Float64)
A1 = convert(Matrix{elty}, [0.244637 -0.63578;
0.22002 0.189026])
Expand Down