add f_calls_limit parameter to minimise #49
Conversation
Codecov Report
@@ Coverage Diff @@
## master #49 +/- ##
==========================================
+ Coverage 89.55% 90.14% +0.58%
==========================================
Files 4 4
Lines 67 71 +4
==========================================
+ Hits 60 64 +4
Misses 7 7
Continue to review full report at Codecov.
|
src/optimise.jl
Outdated
|
|
||
| # find candidate for upper bound of global minimum by just evaluating a point in the interval: | ||
| m = sup(f(Interval.(mid.(X)))) # evaluate at midpoint of current interval | ||
| f_calls += 3 |
There was a problem hiding this comment.
This is a single call to f so should just increment by 1?
|
Great, thanks! Could you please add a couple of tests for this? |
|
I've added a test and improved a bit the termination criteria so it's more accurate. |
|
|
||
| """ | ||
| minimise(f, X, structure = SortedVector, tol=1e-3) | ||
| minimise(f, X, structure = SortedVector, tol=1e-3, f_calls_limit=Inf) |
There was a problem hiding this comment.
Inf is a Float64. Presumably the number of calls should be an integer. So this should be replaced by some large integer like 10^20, or given a sentinel value like -1 (probably preferable).
| @test minimisers[1] ⊆ -0.1..0.1 | ||
|
|
||
| global n_calls = 0 | ||
| f = x -> begin global n_calls += 1; x^2 end |
There was a problem hiding this comment.
You should probably use a let block instead of the global variable.
| global n_calls = 0 | ||
| f = x -> begin global n_calls += 1; x^2 end | ||
| global_min, minimisers = minimise(f, -10..11, tol = 1e-10, f_calls_limit = 10) | ||
| @test n_calls == 10 #note : for other values we can overshoot, since we call 3 times per iteration |
There was a problem hiding this comment.
Maybe the minimise function should return the total number of calls.
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #49 +/- ##
==========================================
+ Coverage 89.55% 90.14% +0.58%
==========================================
Files 4 4
Lines 67 71 +4
==========================================
+ Hits 60 64 +4
Misses 7 7 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
4 participants
This adds an option to limit the number of function evaluations the minimise method can do. I used the same name as in Optim.jl.
Using the following I counted that the function was getting called 3 times per iteration, which seems to hold across dimensions.
fix #44