Skip to content

Commit 1c6be78

Browse files
committed
Remove +-(UniformScaling, Number) to avoid ambiguous behavior as pointed
out in #17083
1 parent 8f99882 commit 1c6be78

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

base/deprecated.jl

+5
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,11 @@ function transpose(x)
775775
return x
776776
end
777777

778+
@deprecate (+)(J::UniformScaling, x::Number) J.λ + x
779+
@deprecate (+)(x::Number, J::UniformScaling) x + J.λ
780+
@deprecate (-)(J::UniformScaling, x::Number) J.λ - x
781+
@deprecate (-)(x::Number, J::UniformScaling) x - J.λ
782+
778783
# During the 0.5 development cycle, do not add any deprecations below this line
779784
# To be deprecated in 0.6
780785

base/linalg/uniformscaling.jl

-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,11 @@ zero{T}(J::UniformScaling{T}) = zero(UniformScaling{T})
3333
(+){T}(B::BitArray{2},J::UniformScaling{T}) = Array(B) + J
3434
(+)(J::UniformScaling, B::BitArray{2}) = J + Array(B)
3535
(+)(J::UniformScaling, A::AbstractMatrix) = A + J
36-
(+)(J::UniformScaling, x::Number) = J.λ + x
37-
(+)(x::Number, J::UniformScaling) = x + J.λ
3836

3937
(-)(J::UniformScaling) = UniformScaling(-J.λ)
4038
(-)(J1::UniformScaling, J2::UniformScaling) = UniformScaling(J1.λ-J2.λ)
4139
(-)(B::BitArray{2}, J::UniformScaling) = Array(B) - J
4240
(-)(J::UniformScaling, B::BitArray{2}) = J - Array(B)
43-
(-)(J::UniformScaling, x::Number) = J.λ - x
44-
(-)(x::Number, J::UniformScaling) = x - J.λ
4541

4642
for (t1, t2) in ((:UnitUpperTriangular, :UpperTriangular),
4743
(:UnitLowerTriangular, :LowerTriangular))

test/linalg/uniformscaling.jl

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ srand(123)
1818
α = randn()
1919
@test α .* UniformScaling(1.0) == UniformScaling(1.0) .* α
2020
@test UniformScaling(α)./α == UniformScaling(1.0)
21-
@test α + UniformScaling(1.0) == UniformScaling(1.0) + α
22-
@test α - UniformScaling(1.0) == -(UniformScaling(1.0) - α)
2321
@test copy(UniformScaling(one(Float64))) == UniformScaling(one(Float64))
2422
@test sprint(show,UniformScaling(one(Float32))) == "UniformScaling{Float32}\n1.0*I"
2523

0 commit comments

Comments
 (0)