Fixes and tests for constructors

Author: mschauer

src/SDiagonal.jl

@@ -17,9 +17,12 @@ struct SDiagonal{N,T} <: StaticMatrix{N, N, T}
     diag::SVector{N,T}
     SDiagonal{N,T}(diag::SVector{N,T}) where {N,T} = new(diag)
 end    
+diagtype{N,T}(::Type{SDiagonal{N,T}}) = SVector{N,T}
+diagtype{N}(::Type{SDiagonal{N}}) = SVector{N}
 
 # this is to deal with convert.jl
-@inline (::Type{SDiagonal})(a::AbstractVector) = SDiagonal(SVector(a)) 
+@inline (::Type{SD})(a::AbstractVector) where {SD <: SDiagonal} = SD(diagtype(SD)(a)) 
+@inline (::Type{SD})(a::Tuple) where {SD <: SDiagonal} = SD(diagtype(SD)(a)) 
 @inline (::Type{SDiagonal}){N,T}(a::SVector{N,T}) = SDiagonal{N,T}(a) 
 
 @generated function SDiagonal{N,T}(a::SMatrix{N,N,T})
@@ -34,23 +37,25 @@ end
 convert{N,T}(::Type{SDiagonal{N,T}}, D::SDiagonal{N,T}) = D
 convert{N,T}(::Type{SDiagonal{N,T}}, D::SDiagonal) = SDiagonal{N,T}(convert(SVector{N,T}, D.diag))
 
-size(D::SDiagonal) = (length(D.diag),length(D.diag))
+size{N}(D::SDiagonal{N}) = (N,N)
 
-function size(D::SDiagonal,d::Integer)
+function size{N}(D::SDiagonal{N},d::Int64)
     if d<1
         throw(ArgumentError("dimension must be ≥ 1, got $d"))
     end
-    return d<=2 ? length(D.diag) : 1
+    return d<=2 ? N : 1
 end
 
-function getindex{T}(D::SDiagonal{T}, i::Int, j::Int)  
+Base.@propagate_inbounds function getindex{T}(D::SDiagonal{T}, i::Int, j::Int)  
+    @boundscheck checkbounds(D, i, j)
     if i == j
         D.diag[i]
     else
         zero(T)
     end
 end
 
+# linear indexing?
 
 ishermitian{T<:Real}(D::SDiagonal{T}) = true
 ishermitian(D::SDiagonal) = all(D.diag .== real(D.diag))
@@ -59,10 +64,6 @@ isposdef(D::SDiagonal) = all(D.diag .> 0)
 
 factorize(D::SDiagonal) = D
 
-abs(D::SDiagonal) = SDiagonal(abs(D.diag))
-real(D::SDiagonal) = SDiagonal(real(D.diag))
-imag(D::SDiagonal) = SDiagonal(imag(D.diag))
-
 ==(Da::SDiagonal, Db::SDiagonal) = Da.diag == Db.diag
 -(A::SDiagonal) = SDiagonal(-A.diag)
 +(Da::SDiagonal, Db::SDiagonal) = SDiagonal(Da.diag + Db.diag)
@@ -95,7 +96,7 @@ function logdet{N,T<:Complex}(D::SDiagonal{N,T}) #Make sure branch cut is correc
 end
 
 
-eye{N,T}(::Type{SDiagonal{N,T}}) = SDiagonal(one(SVector{n,Int}))
+eye{N,T}(::Type{SDiagonal{N,T}}) = SDiagonal(one(SVector{N,T}))
 
 expm(D::SDiagonal) = SDiagonal(exp.(D.diag))
 logm(D::SDiagonal) = SDiagonal(log.(D.diag))

test/SDiagonal.jl

@@ -0,0 +1,51 @@
+@testset "SDiagonal" begin
+    @testset "Constructors" begin
+        @test SDiagonal{1,Int64}((1,)).diag === SVector{1,Int64}((1,))
+        @test SDiagonal{1,Float64}((1,)).diag === SVector{1,Float64}((1,))
+     
+        @test SDiagonal{4,Float64}((1, 1.0, 1, 1)).diag.data === (1.0, 1.0, 1.0, 1.0)
+
+        # Bad input
+        @test_throws Exception SMatrix{1,Int}()
+        @test_throws Exception SMatrix{2,Int}((1,))
+
+        # From SMatrix
+        @test SDiagonal(SMatrix{2,2,Int}((1,2,3,4))).diag.data === (1,4)
+
+    end
+
+    @testset "Methods" begin
+        m = SDiagonal(@SVector [11, 12, 13, 14])
+
+        @test isimmutable(m) == true
+
+        @test m[1,1] === 11
+        @test m[2,2] === 12
+        @test m[3,3] === 13
+        @test m[4,4] === 14
+        
+        for i in 1:4
+            for j in 1:4
+                i == j || @test m[i,j] === 0
+            end
+        end
+        
+        @test_throws Exception m[5,5]
+        
+        @test_throws Exception m[1,5]
+        
+    
+        @test size(m) === (4, 4)
+        @test size(typeof(m)) === (4, 4)
+        @test size(SDiagonal{4}) === (4, 4)
+
+        @test size(m, 1) === 4
+        @test size(m, 2) === 4
+        @test size(typeof(m), 1) === 4
+        @test size(typeof(m), 2) === 4
+
+        @test length(m) === 4*4
+
+        @test_throws Exception m[1] = 1
+    end
+end

test/runtests.jl

@@ -13,6 +13,8 @@ include("FieldVector.jl")
 include("Scalar.jl")
 include("SUnitRange.jl")
 include("SizedArray.jl")
+include("SDiagonal.jl")
+
 include("custom_types.jl")
 
 include("core.jl")