implement correct behavior for findin function with (Any,b::UnitRange…

…) argument
JuliaLang · Jan 11, 2016 · 75336c6 · 75336c6
1 parent ef59efe
commit 75336c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -863,22 +863,9 @@ function indexin(a::AbstractArray, b::AbstractArray)
     [get(bdict, i, 0) for i in a]
 end
 
-# findin (the index of intersection)
-function findin(a, b::UnitRange)
-    ind = Array(Int, 0)
-    f = first(b)
-    l = last(b)
-    for i = 1:length(a)
-        if f <= a[i] <= l
-            push!(ind, i)
-        end
-    end
-    ind
-end
-
 function findin(a, b)
     ind = Array(Int, 0)
-    bset = Set(b)
+    bset = unique(b)
     @inbounds for i = 1:length(a)
         a[i] in bset && push!(ind, i)
     end

diff --git a/test/ranges.jl b/test/ranges.jl
@@ -45,6 +45,8 @@ r = 5:-1:1
 @test isempty((1:4)[5:4])
 @test_throws BoundsError (1:10)[8:-1:-2]
 
+@test findin([5.2, 3.3], 3:20) == findin([5.2, 3.3], collect(3:20))
+
 let
     span = 5:20
     r = -7:3:42