Fixed and refined some RowVector/ConjArray tests

Author: Andy Ferris

base/exports.jl

@@ -50,6 +50,8 @@ export
     Complex64,
     Complex32,
     ConjArray,
+    ConjVector,
+    ConjMatrix,
     DenseMatrix,
     DenseVecOrMat,
     DenseVector,

base/linalg/conjarray.jl

@@ -14,6 +14,9 @@ end
 
 @inline ConjArray{T,N}(a::AbstractArray{T,N}) = ConjArray{conj_type(T), N, typeof(a)}(a)
 
+typealias ConjVector{T, V <: AbstractVector} ConjArray{T, 1, V}
+typealias ConjMatrix{T, M <: AbstractMatrix} ConjArray{T, 2, M}
+
 # This type can cause the element type to change under conjugation - e.g. an array of complex arrays.
 @inline conj_type(x) = conj_type(typeof(x))
 @inline conj_type{T}(::Type{T}) = promote_op(conj, T)
@@ -23,7 +26,8 @@ end
 @inline parent_type{T,N,A}(::Type{ConjArray{T,N,A}}) = A
 
 @inline size(a::ConjArray) = size(a.parent)
-linearindexing{CA <: ConjArray}(::Union{CA,Type{CA}}) = linearindexing(parent_type(CA))
+linearindexing{CA <: ConjArray}(::CA) = linearindexing(parent_type(CA))
+linearindexing{CA <: ConjArray}(::Type{CA}) = linearindexing(parent_type(CA))
 
 @propagate_inbounds getindex{T,N}(a::ConjArray{T,N}, i::Int) = conj(getindex(a.parent, i))
 @propagate_inbounds getindex{T,N}(a::ConjArray{T,N}, i::Vararg{Int,N}) = conj(getindex(a.parent, i...))

base/linalg/linalg.jl

@@ -23,6 +23,8 @@ export
 # Types
     RowVector,
     ConjArray,
+    ConjVector,
+    ConjMatrix,
     SymTridiagonal,
     Tridiagonal,
     Bidiagonal,

test/linalg/rowvector.jl

@@ -12,7 +12,7 @@
     @test size(RowVector{Int}(1,3)) === (1,3)
     @test size(RowVector{Int}((3,))) === (1,3)
     @test size(RowVector{Int}((1,3))) === (1,3)
-    @test_throws Exception RowVector{Float64, Vector{Int}}(v)
+    @test_throws ErrorException RowVector{Float64, Vector{Int}}(v)
 
     @test (v.')::RowVector == [1 2 3]
     @test (v')::RowVector == [1 2 3]
@@ -25,7 +25,7 @@
     @test (rv.')::Vector == [1, 2, 3]
     @test (rv')::Vector == [1, 2, 3]
     @test (tz.')::Vector == [1+im, 2, 3]
-    @test (tz')::Vector == [1-im, 2, 3]
+    @test (tz')::ConjVector == [1-im, 2, 3]
 
     @test conj(rv) === rv
     @test conj(tz) == [1-im 2 3]
@@ -59,19 +59,19 @@ end
     rv = v.'
 
     @test (rv*d)::RowVector == [2,6,12].'
-    @test_throws Exception d*rv
+    @test_throws DimensionMismatch d*rv
 
     @test (d*rv.')::Vector == [2,6,12]
 
-    @test_throws Exception rv.'*d
+    @test_throws DimensionMismatch rv.'*d
 
     @test (d*rv')::Vector == [2,6,12]
 
-    @test_throws Exception rv'*d
+    @test_throws DimensionMismatch rv'*d
 
     @test (rv/d)::RowVector ≈ [2/1  3/2  4/3]
 
-    @test_throws Exception d \ rv
+    @test_throws DimensionMismatch d \ rv
 end
 
 @testset "Bidiagonal ambiguity methods" begin
@@ -81,7 +81,7 @@ end
 
     @test (rv/bd)::RowVector ≈ [2/1  3/2  4/3]
 
-    @test_throws Exception bd \ rv
+    @test_throws DimensionMismatch bd \ rv
 end
 
 @testset "hcat" begin
@@ -94,7 +94,7 @@ end
     v = [2,3,4]
     rv = v.'
 
-    @test_throws Exception mat \ rv
+    @test_throws DimensionMismatch mat \ rv
 end
 
 @testset "Multiplication" begin
@@ -104,65 +104,65 @@ end
 
     @test (rv*v) === 14
     @test (rv*mat)::RowVector == [1 4 9]
-    @test_throws Exception [1]*reshape([1],(1,1)) # no longer permitted
-    @test_throws Exception rv*rv
+    @test_throws DimensionMismatch [1]*reshape([1],(1,1)) # no longer permitted
+    @test_throws DimensionMismatch rv*rv
     @test (v*rv)::Matrix == [1 2 3; 2 4 6; 3 6 9]
-    @test_throws Exception v*v # Was previously a missing method error, now an error message
-    @test_throws Exception mat*rv
+    @test_throws DimensionMismatch v*v # Was previously a missing method error, now an error message
+    @test_throws DimensionMismatch mat*rv
 
-    @test_throws Exception rv*v.'
+    @test_throws DimensionMismatch rv*v.'
     @test (rv*mat.')::RowVector == [1 4 9]
-    @test_throws Exception [1]*reshape([1],(1,1)).' # no longer permitted
+    @test_throws DimensionMismatch [1]*reshape([1],(1,1)).' # no longer permitted
     @test rv*rv.' === 14
-    @test_throws Exception v*rv.'
+    @test_throws DimensionMismatch v*rv.'
     @test (v*v.')::Matrix == [1 2 3; 2 4 6; 3 6 9]
     @test (mat*rv.')::Vector == [1,4,9]
 
     @test (rv.'*v.')::Matrix == [1 2 3; 2 4 6; 3 6 9]
-    @test_throws Exception rv.'*mat.'
+    @test_throws DimensionMismatch rv.'*mat.'
     @test (v.'*mat.')::RowVector == [1 4 9]
-    @test_throws Exception rv.'*rv.'
+    @test_throws DimensionMismatch rv.'*rv.'
     @test v.'*rv.' === 14
-    @test_throws Exception v.'*v.'
+    @test_throws DimensionMismatch v.'*v.'
     @test (mat.'*rv.')::Vector == [1,4,9]
 
-    @test_throws Exception rv.'*v
-    @test_throws Exception rv.'*mat
+    @test_throws DimensionMismatch rv.'*v
+    @test_throws DimensionMismatch rv.'*mat
     @test (v.'*mat)::RowVector == [1 4 9]
     @test (rv.'*rv)::Matrix == [1 2 3; 2 4 6; 3 6 9]
-    @test_throws Exception v.'*rv
+    @test_throws DimensionMismatch v.'*rv
     @test v.'*v === 14
-    @test_throws Exception mat.'*rv
+    @test_throws DimensionMismatch mat.'*rv
 
     z = [1+im,2,3]
     cz = z'
     mat = diagm([1+im,2,3])
 
     @test cz*z === 15 + 0im
 
-    @test_throws Exception cz*z'
+    @test_throws DimensionMismatch cz*z'
     @test (cz*mat')::RowVector == [-2im 4 9]
-    @test_throws Exception [1]*reshape([1],(1,1))' # no longer permitted
+    @test_throws DimensionMismatch [1]*reshape([1],(1,1))' # no longer permitted
     @test cz*cz' === 15 + 0im
-    @test_throws Exception z*vz'
+    @test_throws DimensionMismatch z*cz'
     @test (z*z')::Matrix == [2 2+2im 3+3im; 2-2im 4 6; 3-3im 6 9]
     @test (mat*cz')::Vector == [2im,4,9]
 
     @test (cz'*z')::Matrix == [2 2+2im 3+3im; 2-2im 4 6; 3-3im 6 9]
-    @test_throws Exception cz'*mat'
+    @test_throws DimensionMismatch cz'*mat'
     @test (z'*mat')::RowVector == [-2im 4 9]
-    @test_throws Exception cz'*cz'
+    @test_throws DimensionMismatch cz'*cz'
     @test z'*cz' === 15 + 0im
-    @test_throws Exception z'*z'
+    @test_throws DimensionMismatch z'*z'
     @test (mat'*cz')::Vector == [2,4,9]
 
-    @test_throws Exception cz'*z
-    @test_throws Exception cz'*mat
+    @test_throws DimensionMismatch cz'*z
+    @test_throws DimensionMismatch cz'*mat
     @test (z'*mat)::RowVector == [2 4 9]
     @test (cz'*cz)::Matrix == [2 2+2im 3+3im; 2-2im 4 6; 3-3im 6 9]
-    @test_throws Exception z'*cz
+    @test_throws DimensionMismatch z'*cz
     @test z'*z === 15 + 0im
-    @test_throws Exception mat'*cz
+    @test_throws DimensionMismatch mat'*cz
 end
 
 @testset "norm" begin
@@ -202,7 +202,7 @@ end
 
     @test (rv/mat)::RowVector ≈ [2/1  3/2  4/3]
 
-    @test_throws Exception mat\rv
+    @test_throws DimensionMismatch mat\rv
 end
 
 @testset "AbstractTriangular ambiguity methods" begin
@@ -211,31 +211,31 @@ end
     rv = v.'
 
     @test (rv*ut)::RowVector == [2 6 12]
-    @test_throws Exception ut*rv
+    @test_throws DimensionMismatch ut*rv
 
     @test (rv*ut.')::RowVector == [2 6 12]
     @test (ut*rv.')::Vector == [2,6,12]
 
     @test (ut.'*rv.')::Vector == [2,6,12]
-    @test_throws Exception rv.'*ut.'
+    @test_throws DimensionMismatch rv.'*ut.'
 
-    @test_throws Exception ut.'*rv
-    @test_throws Exception rv.'*ut
+    @test_throws DimensionMismatch ut.'*rv
+    @test_throws DimensionMismatch rv.'*ut
 
     @test (rv*ut')::RowVector == [2 6 12]
     @test (ut*rv')::Vector == [2,6,12]
 
-    @test_throws Exception rv'*ut'
+    @test_throws DimensionMismatch rv'*ut'
     @test (ut'*rv')::Vector == [2,6,12]
 
-    @test_throws Exception ut'*rv
-    @test_throws Exception rv'*ut
+    @test_throws DimensionMismatch ut'*rv
+    @test_throws DimensionMismatch rv'*ut
 
     @test (rv/ut)::RowVector ≈ [2/1  3/2  4/3]
     @test (rv/ut.')::RowVector ≈ [2/1  3/2  4/3]
     @test (rv/ut')::RowVector ≈ [2/1  3/2  4/3]
 
-    @test_throws Exception ut\rv
+    @test_throws DimensionMismatch ut\rv
 end
 
 

test/sparse/sparse.jl

@@ -1642,9 +1642,9 @@ end
 
 # Test temporary fix for issue #16548 in PR #16979. Brittle. Expect to remove with `\` revisions.
 # This is broken by the introduction of RowVector... see brittle comment above.
-#@testset "issue #16548" begin
-#    @test which(\, (SparseMatrixCSC, AbstractVecOrMat)).module == Base.SparseArrays
-#end
+@testset "issue #16548" begin
+    @test_broken which(\, (SparseMatrixCSC, AbstractVecOrMat)).module == Base.SparseArrays
+end
 
 @testset "row indexing a SparseMatrixCSC with non-Int integer type" begin
     A = sparse(UInt32[1,2,3], UInt32[1,2,3], [1.0,2.0,3.0])