From 88ef6dbe251e3cf1ac8740f454d9ab0efde0d30c Mon Sep 17 00:00:00 2001 From: Brendan Tracey Date: Wed, 18 Jul 2018 13:28:19 -0600 Subject: [PATCH] Change DefaultSettings to DefaultSettingsLocal --- optimize/local_example_test.go | 2 +- optimize/types.go | 5 +++-- optimize/unconstrained_test.go | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/optimize/local_example_test.go b/optimize/local_example_test.go index ecc4d177..b9ff6095 100644 --- a/optimize/local_example_test.go +++ b/optimize/local_example_test.go @@ -19,7 +19,7 @@ func ExampleMinimize() { } x := []float64{1.3, 0.7, 0.8, 1.9, 1.2} - settings := optimize.DefaultSettings() + settings := optimize.DefaultSettingsLocal() settings.Recorder = nil settings.GradientThreshold = 1e-12 settings.FunctionConverge = nil diff --git a/optimize/types.go b/optimize/types.go index 2feec6b4..9bc24e95 100644 --- a/optimize/types.go +++ b/optimize/types.go @@ -242,8 +242,9 @@ type Settings struct { Concurrent int } -// DefaultSettings returns a new Settings struct containing the default settings. -func DefaultSettings() *Settings { +// DefaultSettingsLocal returns a new Settings struct that contains default settings +// for running a local optimization. +func DefaultSettingsLocal() *Settings { return &Settings{ GradientThreshold: defaultGradientAbsTol, FunctionThreshold: math.Inf(-1), diff --git a/optimize/unconstrained_test.go b/optimize/unconstrained_test.go index f972d3b8..0f73131b 100644 --- a/optimize/unconstrained_test.go +++ b/optimize/unconstrained_test.go @@ -1160,7 +1160,7 @@ func testLocal(t *testing.T, tests []unconstrainedTest, method GlobalMethod) { continue } - settings := DefaultSettings() + settings := DefaultSettingsLocal() settings.Recorder = nil if method != nil && method.Needs().Gradient { // Turn off function convergence checks for gradient-based methods. @@ -1314,7 +1314,7 @@ func TestNelderMeadOneD(t *testing.T) { } x := []float64{10} m := &NelderMead{} - s := DefaultSettings() + s := DefaultSettingsLocal() s.InitX = x result, err := Global(p, len(x), s, m) if err != nil {