support units in findall (#84)

Author: aplavin

Project.toml

@@ -15,6 +15,7 @@ julia = "0.7, 1"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["Test", "Random", "OffsetArrays"]
+test = ["Test", "Random", "OffsetArrays", "Unitful"]

src/findall.jl

@@ -40,7 +40,7 @@ function Base.findall(interval_d::Base.Fix2{typeof(in),Interval{L,R,T}}, x::Abst
     interval = interval_d.x
     il, ir = firstindex(x), lastindex(x)
     δx = step(x)
-    a,b = if δx < 0
+    a,b = if δx < zero(δx)
         rev = findall(in(interval), reverse(x))
         isempty(rev) && return rev
 
@@ -50,8 +50,8 @@ function Base.findall(interval_d::Base.Fix2{typeof(in),Interval{L,R,T}}, x::Abst
         a,b
     else
         lx, rx = first(x), last(x)
-        l = max(leftendpoint(interval), lx-1)
-        r = min(rightendpoint(interval), rx+1)
+        l = max(leftendpoint(interval), lx - oneunit(δx))
+        r = min(rightendpoint(interval), rx + oneunit(δx))
 
         (l > rx || r < lx) && return 1:0
 

test/findall.jl

@@ -1,4 +1,5 @@
 using OffsetArrays
+using Unitful
 
 # Helper function to test that findall(in(interval), x) works. By
 # default, a reference is generated using the general algorithm,
@@ -124,4 +125,30 @@ end
             assert_in_interval(reverse(x), interval)
         end
     end
+
+    @testset "Units, dates" begin
+        for (x, interval) in [
+            [
+                ([-2u"m", 3u"m"], -1u"m"..1u"m"),
+                ([-2u"m", 0u"m", 1u"m"], -1u"m"..1u"m"),
+                (-2u"m":10u"m":50u"m", -1u"m"..1u"m"),
+                (-2u"m":1u"m":1u"m", -1u"m"..1u"m"),
+                (-2u"km":1u"cm":1u"km", -1u"m"..1u"m"),
+                (-2u"km":1u"cm":1u"km", -1u"m"..1u"km"),
+                (-2u"km":0.1u"m":1u"km", -1u"m"..1u"km"),
+                (-2u"m":0.1u"m":1u"m", -1.05u"m"..1u"km"),
+                (-2u"m":0.1u"m":1u"m", -4u"m"..1u"km"),
+                (-2u"m":0.1u"m":1u"m", -4.05u"m"..1u"km"),
+            ];
+            VERSION >= v"1.4" ? [
+                (Date(2021, 1, 1):Day(1):Date(2021, 3, 1), Date(2020, 1, 11)..Date(2020, 2, 22)),
+                (Date(2021, 1, 1):Day(1):Date(2021, 3, 1), Date(2021, 1, 11)..Date(2021, 2, 22)),
+                (DateTime(2021, 1, 1):Millisecond(10000):DateTime(2021, 3, 1), DateTime(2020, 1, 11)..DateTime(2020, 2, 22)),
+                (DateTime(2021, 1, 1):Millisecond(10000):DateTime(2021, 3, 1), DateTime(2021, 1, 11)..DateTime(2021, 2, 22)),
+            ] : [];
+        ]
+            assert_in_interval(x, interval)
+            assert_in_interval(reverse(x), interval)
+        end
+    end
 end