Overload norm (#72)

* Overload norm

* Zero -> Zeros

* v0.7.2

* Add count

* import normp

* Update runtests.jl

* Test zero dimensional

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "FillArrays"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.7.1"
+version = "0.7.2"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/FillArrays.jl

@@ -4,9 +4,10 @@ using LinearAlgebra, SparseArrays
 import Base: size, getindex, setindex!, IndexStyle, checkbounds, convert,
     +, -, *, /, \, diff, sum, cumsum, maximum, minimum, sort, sort!,
     any, all, axes, isone, iterate, unique, allunique, permutedims, inv,
-    copy, vec, setindex!
+    copy, vec, setindex!, count
 
-import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint, fill!
+import LinearAlgebra: rank, svdvals!, tril, triu, tril!, triu!, diag, transpose, adjoint, fill!, 
+    norm2, norm1, normInf, normMinusInf, normp
 
 import Base.Broadcast: broadcasted, DefaultArrayStyle, broadcast_shape
 
@@ -449,6 +450,10 @@ all(f::Function, x::AbstractFill) = all(f, getindex_value(x))
 any(x::AbstractFill) = any(getindex_value(x))
 all(x::AbstractFill) = all(getindex_value(x))
 
+count(x::Ones{Bool}) = length(x)
+count(x::Zeros{Bool}) = 0
+count(f, x::AbstractFill) = f(getindex_value(x)) ? length(x) : 0
+
 include("fillalgebra.jl")
 include("fillbroadcast.jl")
 

src/fillalgebra.jl

@@ -173,3 +173,21 @@ function -(a::Zeros{T, 1}, b::AbstractRange{V}) where {T, V}
     return -b + a
 end
 -(a::AbstractRange{T}, b::Zeros{V, 1}) where {T, V} = a + b
+
+
+
+####
+# norm
+####
+
+for op in (:norm1, :norm2, :normInf, :normMinusInf)
+    @eval $op(a::Zeros) = norm(getindex_value(a))
+end
+
+normp(a::Zeros, p) = norm(getindex_value(a))
+
+norm1(a::AbstractFill) = length(a)*norm(getindex_value(a))
+norm2(a::AbstractFill) = sqrt(length(a))*norm(getindex_value(a))
+normp(a::AbstractFill, p) = (length(a))^(1/p)*norm(getindex_value(a))
+normInf(a::AbstractFill) = norm(getindex_value(a))
+normMinusInf(a::AbstractFill) = norm(getindex_value(a))

test/runtests.jl

@@ -830,4 +830,20 @@ end
     @test E*(1:5) ≡ 1.0:5.0
     @test (1:5)'E == (1.0:5)'
     @test E*E ≡ E
-end   
+end  
+
+@testset "count" begin
+    @test count(Ones{Bool}(10)) == count(Fill(true,10)) == 10
+    @test count(Zeros{Bool}(10)) == count(Fill(false,10)) == 0
+    @test count(x -> 1 ≤ x < 2, Fill(1.3,10)) == 10
+    @test count(x -> 1 ≤ x < 2, Fill(2.0,10)) == 0
+end
+
+@testset "norm" begin
+    for a in (Zeros{Int}(5), Zeros(5,3), Zeros(2,3,3),
+                Ones{Int}(5), Ones(5,3), Ones(2,3,3),
+                Fill(2.3,5), Fill([2.3,4.2],5), Fill(4)),
+        p in (-Inf, 0, 0.1, 1, 2, 3, Inf)
+        @test norm(a,p) ≈ norm(Array(a),p)
+    end
+end