Fix any and all (#82)

* Fix any and all

* v0.8.3

* Throw errors if any/all are non-boolean

Author: dlfivefifty

Project.toml

@@ -1,6 +1,6 @@
 name = "FillArrays"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
-version = "0.8.2"
+version = "0.8.3"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -11,8 +11,8 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 julia = "1"
 
 [extras]
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test","Base64"]
+test = ["Test", "Base64"]

src/FillArrays.jl

@@ -453,20 +453,20 @@ function any(f::Function, IM::Eye{T}) where T
     d1, d2 = size(IM)
     (d1 < 1 || d2 < 1) && return false
     (d1 > 1 || d2 > 1) && return f(zero(T)) || f(one(T))
-    return f(one(T))
+    return any(f(one(T)))
 end
 
 function all(f::Function, IM::Eye{T}) where T
     d1, d2 = size(IM)
     (d1 < 1 || d2 < 1) && return false
     (d1 > 1 || d2 > 1) && return f(zero(T)) && f(one(T))
-    return f(one(T))
+    return all(f(one(T)))
 end
 
 # In particular, these make iszero(Eye(n))  efficient.
 # use any/all on scalar to get Boolean error message
-any(f::Function, x::AbstractFill) = any(f, getindex_value(x))
-all(f::Function, x::AbstractFill) = all(f, getindex_value(x))
+any(f::Function, x::AbstractFill) = any(f(getindex_value(x)))
+all(f::Function, x::AbstractFill) = all(f(getindex_value(x)))
 any(x::AbstractFill) = any(getindex_value(x))
 all(x::AbstractFill) = all(getindex_value(x))
 

test/runtests.jl

@@ -712,17 +712,23 @@ end
     @testset "all/any" begin
         @test any(Ones{Bool}(10)) === all(Ones{Bool}(10)) === any(Fill(true,10)) === all(Fill(true,10)) === true
         @test any(Zeros{Bool}(10)) === all(Zeros{Bool}(10)) === any(Fill(false,10)) === all(Fill(false,10)) === false
+        @test all(b -> ndims(b) ==  1, Fill([1,2],10))
+        @test any(b -> ndims(b) ==  1, Fill([1,2],10))
     end
 
     @testset "Error" begin
         @test_throws TypeError any(exp, Fill(1,5))
         @test_throws TypeError all(exp, Fill(1,5))
+        @test_throws TypeError any(exp, Eye(5))
+        @test_throws TypeError all(exp, Eye(5))
         @test_throws TypeError any(Fill(1,5))
         @test_throws TypeError all(Fill(1,5))
         @test_throws TypeError any(Zeros(5))
         @test_throws TypeError all(Zeros(5))
         @test_throws TypeError any(Ones(5))
         @test_throws TypeError all(Ones(5))
+        @test_throws TypeError any(Eye(5))
+        @test_throws TypeError all(Eye(5))        
     end
 end