Fix vecnorm for Vector{Vector{T}} (#22945)

Use iszero in countnz
JuliaLang · Aug 7, 2017 · 72be7cb · 72be7cb
1 parent ed746ed
commit 72be7cb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/base/linalg/generic.jl b/base/linalg/generic.jl
@@ -431,16 +431,15 @@ julia> vecnorm([1 2 3 4 5 6 7 8 9])
 ```
 """
 function vecnorm(itr, p::Real=2)
-    isempty(itr) && return float(real(zero(eltype(itr))))
+    isempty(itr) && return float(norm(zero(eltype(itr))))
     if p == 2
         return vecnorm2(itr)
     elseif p == 1
         return vecnorm1(itr)
     elseif p == Inf
         return vecnormInf(itr)
     elseif p == 0
-        return convert(typeof(float(real(zero(eltype(itr))))),
-               countnz(itr))
+        return typeof(float(norm(first(itr))))(count(!iszero, itr))
     elseif p == -Inf
         return vecnormMinusInf(itr)
     else

diff --git a/test/arrayops.jl b/test/arrayops.jl
@@ -457,8 +457,8 @@ end
     # @test find(s) == [1,2,3,4,5]
     @test find(c -> c == 'l', s) == [3]
     g = graphemes("日本語")
-    @test find(g) == [1,2,3]
     @test find(isascii, g) == Int[]
+    @test find((i % 2 for i in 1:10)) == collect(1:2:9)
 end
 @testset "findn" begin
     b = findn(ones(2,2,2,2))

diff --git a/test/linalg/generic.jl b/test/linalg/generic.jl
@@ -270,7 +270,8 @@ end
 
 @testset "generic vecnorm for arrays of arrays" begin
     x = Vector{Int}[[1,2], [3,4]]
-    @test norm(x) ≈ sqrt(30)
+    @test @inferred(norm(x)) ≈ sqrt(30)
+    @test norm(x, 0) == length(x)
     @test norm(x, 1) ≈ sqrt(5) + 5
     @test norm(x, 3) ≈ cbrt(sqrt(125)+125)
 end