Merge pull request #13833 from artkuo/rangemulsol

fix range bugs for matrix multiply/solve
JuliaLang · Nov 12, 2015 · 0d2ea5c · 0d2ea5c
2 parents 5393150 + 392b1a3
commit 0d2ea5c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/base/linalg/bidiag.jl b/base/linalg/bidiag.jl
@@ -262,7 +262,7 @@ function naivesub!{T}(A::Bidiagonal{T}, b::AbstractVector, x::AbstractVector = b
     x
 end
 
-function \{T,S}(A::Bidiagonal{T}, B::AbstractVecOrMat{S})
+function \{T,S}(A::Bidiagonal{T}, B::StridedVecOrMat{S})
     TS = typeof(zero(T)*zero(S) + zero(T)*zero(S))
     TS == S ? A_ldiv_B!(A, copy(B)) : A_ldiv_B!(A, convert(AbstractArray{TS}, B))
 end

diff --git a/base/range.jl b/base/range.jl
@@ -647,6 +647,10 @@ end
 ./(r::FloatRange, x::Real)   = FloatRange(r.start/x, r.step/x, r.len, r.divisor)
 ./(r::LinSpace, x::Real)     = LinSpace(r.start / x, r.stop / x, r.len, r.divisor)
 
+# Matrix multiplication/solve on ranges, A*r should treat r as collected vector
+*{T}(A::AbstractArray{T, 2}, r::Range) = A*collect(r)
+\{T}(A::AbstractArray{T, 2}, r::Range) = A\collect(r)
+
 promote_rule{T1,T2}(::Type{UnitRange{T1}},::Type{UnitRange{T2}}) =
     UnitRange{promote_type(T1,T2)}
 convert{T}(::Type{UnitRange{T}}, r::UnitRange{T}) = r

diff --git a/test/ranges.jl b/test/ranges.jl
@@ -250,6 +250,11 @@ end
 @test all(([1:5;] - (1:5)) .== 0)
 @test all(((1:5) - [1:5;]) .== 0)
 
+# matrix multiplication between matrix and range, e.g. A*r
+@test [1 2 3;]*(1:3) == [14]
+# and a matrix solve A\r
+@test [1 0; 0 1]\linspace(1,2,2) ≈ [1., 2.]
+
 # tricky floating-point ranges
 
 @test [0.1:0.1:0.3;]   == [linspace(0.1,0.3,3);]     == [1:3;]./10