Merge pull request #24204 from Sacha0/fixvecnorm

fix vecnorm for sparse matrices
JuliaLang · Oct 19, 2017 · 99ef868 · 99ef868
2 parents 40ee27a + bdff18b
commit 99ef868
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/base/sparse/linalg.jl b/base/sparse/linalg.jl
@@ -514,7 +514,7 @@ end
 diff(a::SparseMatrixCSC, dim::Integer)= dim==1 ? sparse_diff1(a) : sparse_diff2(a)
 
 ## norm and rank
-vecnorm(A::SparseMatrixCSC, p::Real=2) = vecnorm(A.nzval, p)
+vecnorm(A::SparseMatrixCSC, p::Real=2) = vecnorm(view(A.nzval, 1:nnz(A)), p)
 
 function norm(A::SparseMatrixCSC,p::Real=2)
     m, n = size(A)

diff --git a/test/sparse/sparse.jl b/test/sparse/sparse.jl
@@ -1619,6 +1619,13 @@ end
     @test norm(Ai,1) ≈ norm(Array(Ai),1)
     @test norm(Ai,Inf) ≈ norm(Array(Ai),Inf)
     @test vecnorm(Ai) ≈ vecnorm(Array(Ai))
+    # make certain entries in nzval beyond
+    # the range specified in colptr do not
+    # impact vecnorm of a sparse matrix
+    foo = speye(4)
+    resize!(foo.nzval, 5)
+    setindex!(foo.nzval, NaN, 5)
+    @test vecnorm(foo) == 2.0
 end
 
 @testset "sparse matrix cond" begin