@@ -186,11 +186,11 @@ function A_mul_B!(D::Diagonal, B::UnitUpperTriangular)
186186 UpperTriangular (B. data)
187187end
188188
189- Ac_mul_B (D:: Diagonal , B:: Diagonal ) = Diagonal (ctranspose .(D. diag) .* B. diag)
190- Ac_mul_B (A:: AbstractTriangular , D:: Diagonal ) = A_mul_B! (ctranspose (A), D)
189+ Ac_mul_B (D:: Diagonal , B:: Diagonal ) = Diagonal (adjoint .(D. diag) .* B. diag)
190+ Ac_mul_B (A:: AbstractTriangular , D:: Diagonal ) = A_mul_B! (adjoint (A), D)
191191function Ac_mul_B (A:: AbstractMatrix , D:: Diagonal )
192192 Ac = similar (A, promote_op (* , eltype (A), eltype (D. diag)), (size (A, 2 ), size (A, 1 )))
193- ctranspose ! (Ac, A)
193+ adjoint ! (Ac, A)
194194 A_mul_B! (Ac, D)
195195end
196196
@@ -202,12 +202,12 @@ function At_mul_B(A::AbstractMatrix, D::Diagonal)
202202 A_mul_B! (At, D)
203203end
204204
205- A_mul_Bc (D:: Diagonal , B:: Diagonal ) = Diagonal (D. diag .* ctranspose .(B. diag))
206- A_mul_Bc (D:: Diagonal , B:: AbstractTriangular ) = A_mul_B! (D, ctranspose (B))
205+ A_mul_Bc (D:: Diagonal , B:: Diagonal ) = Diagonal (D. diag .* adjoint .(B. diag))
206+ A_mul_Bc (D:: Diagonal , B:: AbstractTriangular ) = A_mul_B! (D, adjoint (B))
207207A_mul_Bc (D:: Diagonal , Q:: Union{Base.LinAlg.QRCompactWYQ,Base.LinAlg.QRPackedQ} ) = A_mul_Bc! (Array (D), Q)
208208function A_mul_Bc (D:: Diagonal , A:: AbstractMatrix )
209209 Ac = similar (A, promote_op (* , eltype (A), eltype (D. diag)), (size (A, 2 ), size (A, 1 )))
210- ctranspose ! (Ac, A)
210+ adjoint ! (Ac, A)
211211 A_mul_B! (D, Ac)
212212end
213213
@@ -219,7 +219,7 @@ function A_mul_Bt(D::Diagonal, A::AbstractMatrix)
219219 A_mul_B! (D, At)
220220end
221221
222- Ac_mul_Bc (D:: Diagonal , B:: Diagonal ) = Diagonal (ctranspose .(D. diag) .* ctranspose .(B. diag))
222+ Ac_mul_Bc (D:: Diagonal , B:: Diagonal ) = Diagonal (adjoint .(D. diag) .* adjoint .(B. diag))
223223At_mul_Bt (D:: Diagonal , B:: Diagonal ) = Diagonal (transpose .(D. diag) .* transpose .(B. diag))
224224
225225A_mul_B! (A:: Diagonal ,B:: Diagonal ) = throw (MethodError (A_mul_B!, Tuple{Diagonal,Diagonal}))
@@ -235,11 +235,11 @@ A_mul_Bc!(A::AbstractMatrix,B::Diagonal) = scale!(A,conj(B.diag))
235235
236236# Get ambiguous method if try to unify AbstractVector/AbstractMatrix here using AbstractVecOrMat
237237A_mul_B! (out:: AbstractVector , A:: Diagonal , in:: AbstractVector ) = out .= A. diag .* in
238- Ac_mul_B! (out:: AbstractVector , A:: Diagonal , in:: AbstractVector ) = out .= ctranspose .(A. diag) .* in
238+ Ac_mul_B! (out:: AbstractVector , A:: Diagonal , in:: AbstractVector ) = out .= adjoint .(A. diag) .* in
239239At_mul_B! (out:: AbstractVector , A:: Diagonal , in:: AbstractVector ) = out .= transpose .(A. diag) .* in
240240
241241A_mul_B! (out:: AbstractMatrix , A:: Diagonal , in:: AbstractMatrix ) = out .= A. diag .* in
242- Ac_mul_B! (out:: AbstractMatrix , A:: Diagonal , in:: AbstractMatrix ) = out .= ctranspose .(A. diag) .* in
242+ Ac_mul_B! (out:: AbstractMatrix , A:: Diagonal , in:: AbstractMatrix ) = out .= adjoint .(A. diag) .* in
243243At_mul_B! (out:: AbstractMatrix , A:: Diagonal , in:: AbstractMatrix ) = out .= transpose .(A. diag) .* in
244244
245245# ambiguities with Symmetric/Hermitian
@@ -306,13 +306,13 @@ A_rdiv_Bt!(A::AbstractMatrix{T}, D::Diagonal{T}) where {T} = A_rdiv_B!(A, D)
306306# Methods to resolve ambiguities with `Diagonal`
307307@inline * (rowvec:: RowVector , D:: Diagonal ) = transpose (D * transpose (rowvec))
308308@inline A_mul_Bt (D:: Diagonal , rowvec:: RowVector ) = D* transpose (rowvec)
309- @inline A_mul_Bc (D:: Diagonal , rowvec:: RowVector ) = D* ctranspose (rowvec)
309+ @inline A_mul_Bc (D:: Diagonal , rowvec:: RowVector ) = D* adjoint (rowvec)
310310
311311conj (D:: Diagonal ) = Diagonal (conj (D. diag))
312312transpose (D:: Diagonal{<:Number} ) = D
313313transpose (D:: Diagonal ) = Diagonal (transpose .(D. diag))
314- ctranspose (D:: Diagonal{<:Number} ) = conj (D)
315- ctranspose (D:: Diagonal ) = Diagonal (ctranspose .(D. diag))
314+ adjoint (D:: Diagonal{<:Number} ) = conj (D)
315+ adjoint (D:: Diagonal ) = Diagonal (adjoint .(D. diag))
316316
317317diag (D:: Diagonal ) = D. diag
318318trace (D:: Diagonal ) = sum (D. diag)
0 commit comments