Merge pull request #92 from invenia/rf/filter-fix

Filter return type fix
invenia · Nov 9, 2020 · 7562ae2 · 7562ae2 · rofinn · Nov 17, 2020
2 parents 663a709 + 017892d
commit 7562ae2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/filter.jl b/src/filter.jl
@@ -34,9 +34,9 @@ end
 function apply(data::AbstractArray{Union{T, Missing}}, f::Filter; dims) where T
     d = dim(data, dims)
     mask = map(f.func, eachslice(data; dims=d))
-    # use selectdim to reduce along dimension d using our mask, but call collect
-    # because we don't want to return a view
-    return collect(selectdim(data, d, mask))
+    # use selectdim to reduce along dimension d using our mask, but call copy
+    # because we don't want to return a view and collect may change the return type
+    return copy(selectdim(data, d, mask))
 end
 
 apply(data::AbstractArray, f::Filter) = disallowmissing(data)

diff --git a/test/filter.jl b/test/filter.jl
@@ -144,8 +144,9 @@
 
         @testset "rows" begin
             result = apply(aa, Filter(); dims=:rows)
-            expected = m[[1, 4, 5], :]
+            expected = aa[[1, 4, 5], :]
 
+            @test isa(result, AxisArray)
             @test isequal(result, expected)
             @test isequal(result, Impute.filter(aa; dims=:rows))
             @test isequal(collect(result'), Impute.filter(collect(aa'); dims=:cols))
@@ -155,6 +156,7 @@
             result = apply(aa, Filter(); dims=:cols)
             expected = copy(aa)[:, 3:4]
 
+            @test isa(result, AxisArray)
             @test isequal(result, expected)
             @test isequal(result, Impute.filter(aa; dims=:cols))
             @test isequal(collect(result'), Impute.filter(collect(aa'); dims=:rows))