add ifelse and isfinite to fix #180

Author: Joe Petviashvili

src/array.jl

@@ -58,7 +58,7 @@ import Base: identity, ifft, imag, isinf, isnan, iszero, join, lgamma, log, log1
 import Base: minimum, mod, norm, prod, qr, randn, range, rank, real, rem, replace, round, select, show, inv
 import Base: sign, signbit, sin, sinh, sort, sortperm, std, sqrt, sum, svd, tan, tanh, transpose, trunc, var, any, all
 import Base: cat, hcat, vcat, conv, max, min, sizeof, similar, length, sizeof, vecnorm, linspace
-import Base: diag, diagm
+import Base: diag, diagm, isfinite, ifelse
 
 similar(a::AFArray) = zeros(a)
 similar{T}(a::AFArray, ::Type{T}) = zeros(AFArray{T}, size(a))
@@ -102,6 +102,7 @@ function linspace{T}(::Type{AFArray}, a::T, b::T, c::Integer)
     dx = (b_fl - a_fl)/(Float64(c) - 1.0)
     range(AFArray{Float64}, a_fl, dx, c)
 end
+isfinite(a::AFArray) = !isinf(a) & !isnan(a)
 
 import Base: /, *, +, -, ^, ==, <, >, <=, >=, !, !=, &, |, <<, >>, xor
 

src/util.jl

@@ -1,7 +1,7 @@
 import Base: RefValue, @pure, show, clamp, find
 import Base: cumsum, cumprod, cummin, cummax, chol, abs2
 
-export constant, select, get_last_error, err_to_string, sort_index, fir, iir
+export constant, get_last_error, err_to_string, sort_index, fir, iir
 export mean_weighted, var_weighted, set_array_indexer, set_seq_param_indexer
 export afeval
 
@@ -262,23 +262,23 @@ function constant{N}(val::UInt,sz::NTuple{N,Int})
     AFArray{UInt,N}(arr[])
 end
 
-function select{T1,N1,T2,N2}(cond::AFArray{Bool},a::AFArray{T1,N1},b::AFArray{T2,N2})
+function ifelse{T1,N1,T2,N2}(cond::AFArray{Bool},a::AFArray{T1,N1},b::AFArray{T2,N2})
     out = RefValue{af_array}(0)
     _error(ccall((:af_select,af_lib),af_err,
                  (Ptr{af_array},af_array,af_array,af_array),
                  out,cond.arr,a.arr,b.arr))
     AFArray{typed(T1,T2),batched(N1,N2)}(out[])
 end
 
-function select{T1,N1,T2<:Real}(cond::AFArray{Bool},a::AFArray{T1,N1},b::T2)
+function ifelse{T1,N1,T2<:Real}(cond::AFArray{Bool},a::AFArray{T1,N1},b::T2)
     out = RefValue{af_array}(0)
     _error(ccall((:af_select_scalar_r,af_lib),af_err,
                  (Ptr{af_array},af_array,af_array,Cdouble),
                  out,cond.arr,a.arr,Cdouble(b)))
     AFArray{typed(T1,T2),N1}(out[])
 end
 
-function select{T1,T2,N2}(cond::AFArray{Bool},a::T1,b::AFArray{T2,N2})
+function ifelse{T1,T2,N2}(cond::AFArray{Bool},a::T1,b::AFArray{T2,N2})
     out = RefValue{af_array}(0)
     _error(ccall((:af_select_scalar_l,af_lib),af_err,
                  (Ptr{af_array},af_array,Cdouble,af_array),

test/math.jl

@@ -266,13 +266,16 @@ for op in [:maximum, :minimum, :sum, :prod, :sizeof, :var, :std, :mean, :median,
     end
 end
 
-a = AFArray([true false true])
-b = AFArray([1 2 3])
-c = AFArray([4 5 6; 7 8 9])
+aa = [true false true]
+bb = [1 2 3]
+cc = [4 5 6; 7 8 9]
+a = AFArray(aa)
+b = AFArray(bb)
+c = AFArray(cc)
 
-@test Array(select(a, b, c)) == [1 5 3; 1 8 3]
-@test Array(select(a, 0, b)) == [0 2 0]
-@test Array(select(a, b, 0)) == [1 0 3]
+@test Array(ifelse(a, b, c)) == ifelse.(aa, bb, cc)
+@test Array(ifelse(a, 0, b)) == ifelse.(aa, 0, bb)
+@test Array(ifelse(a, b, 0)) == ifelse.(aa, bb, 0)
 
 @test size(reshape(c, 6)) == (6, )
 @test size(reshape(c, (3,2))) == (3, 2)
@@ -301,3 +304,8 @@ ss[1] = 10
 @test s[1] != 10f0 && ss[1] == 10f0
 ssa = similar(s, Float64)
 @test typeof(ssa) == AFArray{Float64,1}
+
+aa = [NaN Inf 3]
+a = AFArray(aa)
+
+@test Array(@inferred isfinite(a)) == isfinite.(aa)