Merge 619741d into 1bfd55a

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.7-alpha
+julia 0.7-rc1
 
 IterTools
 StaticArrays 0.5.1

src/GeometryTypes.jl

@@ -1,4 +1,3 @@
-__precompile__()
 module GeometryTypes
 
 using StaticArrays

src/baseutils.jl

@@ -26,11 +26,18 @@ best_arg, best_val = argmax(f, iter)
 Computes the first element of iterator, on which f takes its maximum.
 """
 function argmax(f, iter)
-    state = start(iter)
-    best_arg, state = next(iter, state)
+    iter_result = iterate(iter)
+    if iter_result === nothing
+        throw(ArgumentError("Cannot compute the argmax of an empty collection"))
+    end
+    best_arg, state = iter_result
     best_val = f(best_arg)
-    while !done(iter,state)
-        arg, state = next(iter,state)
+    while true
+        iter_result = iterate(iter, state)
+        if iter_result === nothing
+            break
+        end
+        arg, state = iter_result
         val = f(arg)
         if val > best_val
             best_val = val
@@ -40,7 +47,6 @@ function argmax(f, iter)
     best_arg, best_val
 end
 
-
 w_component(::Type{Point{N, T}}) where {N, T} = T(1)
 w_component(::Type{Vec{N, T}}) where {N, T} = T(0)
 

test/baseutils.jl

@@ -0,0 +1,13 @@
+@testset "argmax" begin
+    arg, val = GeometryTypes.argmax(sin, range(0, stop=π, length=101))
+    @test arg ≈ π/2
+    @test val ≈ 1
+
+    arg, val = GeometryTypes.argmax(cos, range(0, stop=π, length=101))
+    @test arg ≈ 0  # 0, not π, because argmax requires a subsequent value to be *strictly better* than the current best
+    @test val ≈ 1.0
+
+    @test @allocated(GeometryTypes.argmax(sin, range(0, stop=π, length=101))) == 0
+
+    @test_throws ArgumentError GeometryTypes.argmax(identity, [])
+end

test/runtests.jl

@@ -7,6 +7,7 @@ using Compat.LinearAlgebra
 
 
 @testset "GeometryTypes" begin
+    include("baseutils.jl")
     include("convexhulls.jl")
     include("polygons.jl")
     include("hyperrectangles.jl")