define .+ and .- for array and scalar arguments instead of +,-. fixes #…

…7294
JuliaLang · Jun 17, 2014 · 8f1fbec · 8f1fbec
1 parent 50408b5
commit 8f1fbec
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/base/range.jl b/base/range.jl
@@ -421,18 +421,18 @@ end
 -(r::OrdinalRange) = range(-r.start, -step(r), length(r))
 -(r::FloatRange)   = FloatRange(-r.start, -r.step, r.len, r.divisor)
 
-+(x::Real, r::UnitRange)  = range(x + r.start, length(r))
-+(x::Real, r::Range) = (x+first(r)):step(r):(x+last(r))
-#+(x::Real, r::StepRange)  = range(x + r.start, r.step, length(r))
-+(x::Real, r::FloatRange) = FloatRange(r.divisor*x + r.start, r.step, r.len, r.divisor)
-+(r::Range, x::Real)      = x + r
-#+(r::FloatRange, x::Real) = x + r
-
--(x::Real, r::Range)      = (x-first(r)):-step(r):(x-last(r))
--(x::Real, r::FloatRange) = FloatRange(r.divisor*x - r.start, -r.step, r.len, r.divisor)
--(r::UnitRange, x::Real)  = range(r.start-x, length(r))
--(r::StepRange , x::Real) = range(r.start-x, r.step, length(r))
--(r::FloatRange, x::Real) = FloatRange(r.start - r.divisor*x, r.step, r.len, r.divisor)
+.+(x::Real, r::UnitRange)  = range(x + r.start, length(r))
+.+(x::Real, r::Range) = (x+first(r)):step(r):(x+last(r))
+#.+(x::Real, r::StepRange)  = range(x + r.start, r.step, length(r))
+.+(x::Real, r::FloatRange) = FloatRange(r.divisor*x + r.start, r.step, r.len, r.divisor)
+.+(r::Range, x::Real)      = x + r
+#.+(r::FloatRange, x::Real) = x + r
+
+.-(x::Real, r::Range)      = (x-first(r)):-step(r):(x-last(r))
+.-(x::Real, r::FloatRange) = FloatRange(r.divisor*x - r.start, -r.step, r.len, r.divisor)
+.-(r::UnitRange, x::Real)  = range(r.start-x, length(r))
+.-(r::StepRange , x::Real) = range(r.start-x, r.step, length(r))
+.-(r::FloatRange, x::Real) = FloatRange(r.start - r.divisor*x, r.step, r.len, r.divisor)
 
 .*(x::Real, r::OrdinalRange) = range(x*r.start, x*step(r), length(r))
 .*(x::Real, r::FloatRange)   = FloatRange(x*r.start, x*r.step, r.len, r.divisor)

diff --git a/base/sparse/sparsematrix.jl b/base/sparse/sparsematrix.jl
@@ -601,11 +601,15 @@ for (op, restype) in ( (:+, Nothing), (:-, Nothing), (:.*, Nothing),
     end # quote
 end # macro
 
-(+)(A::SparseMatrixCSC, B::Union(Array,Number)) = (+)(full(A), B)
-(+)(A::Union(Array,Number), B::SparseMatrixCSC) = (+)(A, full(B))
-
-(-)(A::SparseMatrixCSC, B::Union(Array,Number)) = (-)(full(A), B)
-(-)(A::Union(Array,Number), B::SparseMatrixCSC) = (-)(A, full(B))
+(.+)(A::SparseMatrixCSC, B::Number) = full(A) .+ B
+( +)(A::SparseMatrixCSC, B::Array ) = full(A)  + B
+(.+)(A::Number, B::SparseMatrixCSC) = A .+ full(B)
+( +)(A::Array , B::SparseMatrixCSC) = A  + full(B)
+
+(.-)(A::SparseMatrixCSC, B::Number) = full(A) .- B
+( -)(A::SparseMatrixCSC, B::Array ) = full(A)  - B
+(.-)(A::Number, B::SparseMatrixCSC) = A .- full(B)
+( -)(A::Array , B::SparseMatrixCSC) = A  - full(B)
 
 (.*)(A::SparseMatrixCSC, B::Number) = SparseMatrixCSC(A.m, A.n, copy(A.colptr), copy(A.rowval), A.nzval .* B)
 (.*)(A::Number, B::SparseMatrixCSC) = SparseMatrixCSC(B.m, B.n, copy(B.colptr), copy(B.rowval), A .* B.nzval)