Adding a check within each_replacena to check if its a function and construct a EachReplaceNAWithFunctionResult

Author: paulvictor

src/DataArrays.jl

@@ -25,7 +25,6 @@ module DataArrays
            each_failna,
            each_dropna,
            each_replacena,
-           each_replacenawithfunctionresult,
            EachFailNA,
            EachDropNA,
            EachReplaceNA,

src/abstractdataarray.jl

@@ -157,8 +157,13 @@ type EachReplaceNA{S, T}
     replacement::T
 end
 function each_replacena(da::AbstractDataArray, replacement::Any)
+  if isa(replacement, Function)
+    EachReplaceNAWithFunctionResult(da, replacement)
+  else
     EachReplaceNA(da, convert(eltype(da), replacement))
+  end
 end
+
 function each_replacena(replacement::Any)
     x -> each_replacena(x, replacement)
 end
@@ -172,15 +177,11 @@ end
 type EachReplaceNAWithFunctionResult{T}
     da::AbstractDataArray{T}
     f::Function
-    withData::Bool
-end
-function each_replacenawithfunctionresult(da::AbstractDataArray, f::Function, withData::Bool)
-  EachReplaceNAWithFunctionResult(da, f, withData)
 end
 
 Base.start(itr::EachReplaceNAWithFunctionResult) = 1
 Base.done(itr::EachReplaceNAWithFunctionResult, ind::Int) = ind > length(itr.da)
 function Base.next(itr::EachReplaceNAWithFunctionResult, ind::Integer)
-  item = isna(itr.da, ind) ? (itr.withData ? itr.f(itr.da) : itr.f()) : itr.da[ind]
+  item = isna(itr.da, ind) ? itr.f(itr.da) : itr.da[ind]
   (item, ind + 1)
 end

test/nas.jl

@@ -67,5 +67,5 @@ module TestNAs
     dv = DataArray(Array(1:6), push!(fill(false, 3),fill(true, 3)...))
     a = dropna(dv)
     f = x -> round(Int, mean(dropna(x)))
-    @test collect(each_replacenawithfunctionresult(dv, f, true)) == [1, 2, 3, 2, 2, 2]
+    @test collect(each_replacena(dv, f)) == [1, 2, 3, 2, 2, 2]
 end