@@ -186,11 +186,11 @@ function A_mul_B!(D::Diagonal, B::UnitUpperTriangular)
186
186
UpperTriangular (B. data)
187
187
end
188
188
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)
191
191
function Ac_mul_B (A:: AbstractMatrix , D:: Diagonal )
192
192
Ac = similar (A, promote_op (* , eltype (A), eltype (D. diag)), (size (A, 2 ), size (A, 1 )))
193
- ctranspose ! (Ac, A)
193
+ adjoint ! (Ac, A)
194
194
A_mul_B! (Ac, D)
195
195
end
196
196
@@ -202,12 +202,12 @@ function At_mul_B(A::AbstractMatrix, D::Diagonal)
202
202
A_mul_B! (At, D)
203
203
end
204
204
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))
207
207
A_mul_Bc (D:: Diagonal , Q:: Union{Base.LinAlg.QRCompactWYQ,Base.LinAlg.QRPackedQ} ) = A_mul_Bc! (Array (D), Q)
208
208
function A_mul_Bc (D:: Diagonal , A:: AbstractMatrix )
209
209
Ac = similar (A, promote_op (* , eltype (A), eltype (D. diag)), (size (A, 2 ), size (A, 1 )))
210
- ctranspose ! (Ac, A)
210
+ adjoint ! (Ac, A)
211
211
A_mul_B! (D, Ac)
212
212
end
213
213
@@ -219,7 +219,7 @@ function A_mul_Bt(D::Diagonal, A::AbstractMatrix)
219
219
A_mul_B! (D, At)
220
220
end
221
221
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))
223
223
At_mul_Bt (D:: Diagonal , B:: Diagonal ) = Diagonal (transpose .(D. diag) .* transpose .(B. diag))
224
224
225
225
A_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))
235
235
236
236
# Get ambiguous method if try to unify AbstractVector/AbstractMatrix here using AbstractVecOrMat
237
237
A_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
239
239
At_mul_B! (out:: AbstractVector , A:: Diagonal , in:: AbstractVector ) = out .= transpose .(A. diag) .* in
240
240
241
241
A_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
243
243
At_mul_B! (out:: AbstractMatrix , A:: Diagonal , in:: AbstractMatrix ) = out .= transpose .(A. diag) .* in
244
244
245
245
# ambiguities with Symmetric/Hermitian
@@ -306,13 +306,13 @@ A_rdiv_Bt!(A::AbstractMatrix{T}, D::Diagonal{T}) where {T} = A_rdiv_B!(A, D)
306
306
# Methods to resolve ambiguities with `Diagonal`
307
307
@inline * (rowvec:: RowVector , D:: Diagonal ) = transpose (D * transpose (rowvec))
308
308
@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)
310
310
311
311
conj (D:: Diagonal ) = Diagonal (conj (D. diag))
312
312
transpose (D:: Diagonal{<:Number} ) = D
313
313
transpose (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))
316
316
317
317
diag (D:: Diagonal ) = D. diag
318
318
trace (D:: Diagonal ) = sum (D. diag)
0 commit comments