fixed diagonal and added istrix

JuliaLang · Aug 13, 2015 · 4d50e23 · 4d50e23
1 parent 7465943
commit 4d50e23
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/base/linalg/diagonal.jl b/base/linalg/diagonal.jl
@@ -55,8 +55,29 @@ isposdef(D::Diagonal) = all(D.diag .> 0)
 
 factorize(D::Diagonal) = D
 
-tril(D::Diagonal,i::Integer=0) = i == 0 ? D : zeros(D)
-triu(D::Diagonal,i::Integer=0) = i == 0 ? D : zeros(D)
+istriu(D::Diagonal) = true
+istril(D::Diagonal) = true
+function triu!(D::Diagonal,k::Integer=0)
+    n = size(D,1)
+    if abs(k) > n
+        throw(ArgumentError("requested diagonal, $k, out of bounds in matrix of size ($n,$n)"))
+    elseif k != 0
+        fill!(D.diag,0)
+    end
+    return D
+end
+triu(D::Diagonal,k::Integer=0) = triu!(copy(D),k)
+
+function tril!(D::Diagonal,k::Integer=0)
+    n = size(D,1)
+    if abs(k) > n
+        throw(ArgumentError("requested diagonal, $k, out of bounds in matrix of size ($n,$n)"))
+    elseif k != 0
+        fill!(D.diag,0)
+    end
+    return D
+end
+tril(D::Diagonal,k::Integer=0) = tril!(copy(D),k)
 
 ==(Da::Diagonal, Db::Diagonal) = Da.diag == Db.diag
 -(A::Diagonal)=Diagonal(-A.diag)

diff --git a/test/linalg/diagonal.jl b/test/linalg/diagonal.jl
@@ -84,6 +84,8 @@ for relty in (Float32, Float64, BigFloat), elty in (relty, Complex{relty})
     @test_approx_eq D/D2 Diagonal(D.diag./D2.diag)
 
     # test triu/tril
+    @test istriu(D)
+    @test istril(D)
     @test triu(D,1) == zeros(D)
     @test triu(D,0) == D
     @test tril(D,1) == zeros(D)