prevent slow fallback for sparsevector */ scalar

JuliaLang · Mar 21, 2016 · e2c16ac · e2c16ac
1 parent fdbcdf7
commit e2c16ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/base/sparse/sparsevector.jl b/base/sparse/sparsevector.jl
@@ -1245,11 +1245,10 @@ scale!(x::AbstractSparseVector, a::Complex) = (scale!(nonzeros(x), a); x)
 scale!(a::Real, x::AbstractSparseVector) = scale!(nonzeros(x), a)
 scale!(a::Complex, x::AbstractSparseVector) = scale!(nonzeros(x), a)
 
-# *(x::AbstractSparseVector, a::Real) = SparseVector(length(x), copy(nonzeroinds(x)), scale(nonzeros(x), a))
-# *(x::AbstractSparseVector, a::Complex) = SparseVector(length(x), copy(nonzeroinds(x)), scale(nonzeros(x), a))
-# *(a::Number, x::AbstractSparseVector) = xa)
-# .*(x::AbstractSparseVector, a::Number) = scale(x, a)
-# .*(a::Number, x::AbstractSparseVector) = scale(x, a)
+
+.*(x::AbstractSparseVector, a::Number) = SparseVector(length(x), copy(nonzeroinds(x)), nonzeros(x) * a)
+.*(a::Number, x::AbstractSparseVector) = SparseVector(length(x), copy(nonzeroinds(x)), a * nonzeros(x))
+./(x::AbstractSparseVector, a::Number) = SparseVector(length(x), copy(nonzeroinds(x)), nonzeros(x) / a)
 
 
 # dot

diff --git a/test/sparsedir/sparsevector.jl b/test/sparsedir/sparsevector.jl
@@ -672,6 +672,7 @@ let x = sprand(16, 0.5), x2 = sprand(16, 0.4)
         @test exact_equal(2.5 * x, sx)
         @test exact_equal(x .* 2.5, sx)
         @test exact_equal(2.5 .* x, sx)
+        @test exact_equal(x / 2.5, SparseVector(x.n, x.nzind, x.nzval / 2.5))
 
         xc = copy(x)
         @test is(scale!(xc, 2.5), xc)