use pairs in findmin and findmax, supporting all indexable coll…

…ections
JuliaLang · Aug 24, 2017 · 4931ded · 4931ded
1 parent fd09987
commit 4931ded
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -2068,12 +2068,12 @@ function findmax(a)
     if isempty(a)
         throw(ArgumentError("collection must be non-empty"))
     end
-    s = start(a)
-    mi = i = 1
-    m, s = next(a, s)
-    while !done(a, s)
-        ai, s = next(a, s)
-        i += 1
+    p = pairs(a)
+    s = start(p)
+    (mi, m), s = next(p, s)
+    i = mi
+    while !done(p, s)
+        (i, ai), s = next(p, s)
         ai != ai && continue # assume x != x => x is a NaN
         if m != m || isless(m, ai)
             m = ai
@@ -2108,12 +2108,12 @@ function findmin(a)
     if isempty(a)
         throw(ArgumentError("collection must be non-empty"))
     end
-    s = start(a)
-    mi = i = 1
-    m, s = next(a, s)
-    while !done(a, s)
-        ai, s = next(a, s)
-        i += 1
+    p = pairs(a)
+    s = start(p)
+    (mi, m), s = next(p, s)
+    i = mi
+    while !done(p, s)
+        (i, ai), s = next(p, s)
         ai != ai && continue
         if m != m || isless(ai, m)
             m = ai

diff --git a/test/arrayops.jl b/test/arrayops.jl
@@ -1811,6 +1811,11 @@ s, si = findmax(S)
 @test a == b == s
 @test ai == bi == si
 
+for X in (A, B, S)
+    @test findmin(X) == findmin(Dict(pairs(X)))
+    @test findmax(X) == findmax(Dict(pairs(X)))
+end
+
 fill!(B, 2)
 @test all(x->x==2, B)