Remove +-(UniformScaling, Number) to avoid ambiguous behavior as pointed

out in #17083
JuliaLang · Jul 25, 2016 · 1c6be78 · 1c6be78
1 parent 8f99882
commit 1c6be78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -775,6 +775,11 @@ function transpose(x)
     return x
 end
 
+@deprecate (+)(J::UniformScaling, x::Number) J.λ + x
+@deprecate (+)(x::Number, J::UniformScaling) x + J.λ
+@deprecate (-)(J::UniformScaling, x::Number) J.λ - x
+@deprecate (-)(x::Number, J::UniformScaling) x - J.λ
+
 # During the 0.5 development cycle, do not add any deprecations below this line
 # To be deprecated in 0.6
 

diff --git a/base/linalg/uniformscaling.jl b/base/linalg/uniformscaling.jl
@@ -33,15 +33,11 @@ zero{T}(J::UniformScaling{T}) = zero(UniformScaling{T})
 (+){T}(B::BitArray{2},J::UniformScaling{T}) = Array(B) + J
 (+)(J::UniformScaling, B::BitArray{2})      = J + Array(B)
 (+)(J::UniformScaling, A::AbstractMatrix)   = A + J
-(+)(J::UniformScaling, x::Number)           = J.λ + x
-(+)(x::Number, J::UniformScaling)           = x + J.λ
 
 (-)(J::UniformScaling)                      = UniformScaling(-J.λ)
 (-)(J1::UniformScaling, J2::UniformScaling) = UniformScaling(J1.λ-J2.λ)
 (-)(B::BitArray{2}, J::UniformScaling)      = Array(B) - J
 (-)(J::UniformScaling, B::BitArray{2})      = J - Array(B)
-(-)(J::UniformScaling, x::Number)           = J.λ - x
-(-)(x::Number, J::UniformScaling)           = x - J.λ
 
 for (t1, t2) in ((:UnitUpperTriangular, :UpperTriangular),
                  (:UnitLowerTriangular, :LowerTriangular))

diff --git a/test/linalg/uniformscaling.jl b/test/linalg/uniformscaling.jl
@@ -18,8 +18,6 @@ srand(123)
 α = randn()
 @test α .* UniformScaling(1.0) == UniformScaling(1.0) .* α
 @test UniformScaling(α)./α == UniformScaling(1.0)
-@test α + UniformScaling(1.0) == UniformScaling(1.0) + α
-@test α - UniformScaling(1.0) == -(UniformScaling(1.0) - α)
 @test copy(UniformScaling(one(Float64))) == UniformScaling(one(Float64))
 @test sprint(show,UniformScaling(one(Float32))) == "UniformScaling{Float32}\n1.0*I"