package/gonum
1
0
Fork 0
mirror of https://github.com/gonum/gonum.git synced 2025-10-05 07:06:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change DefaultSettings to DefaultSettingsLocal

Browse Source
This commit is contained in:
Brendan Tracey
2018-07-18 13:28:19 -06:00
parent 3dd933ac47
commit 88ef6dbe25
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
optimize/local_example_test.go
View File

@@ -19,7 +19,7 @@ func ExampleMinimize() {
} }
x := []float64{1.3, 0.7, 0.8, 1.9, 1.2} x := []float64{1.3, 0.7, 0.8, 1.9, 1.2}
settings := optimize.DefaultSettings() settings := optimize.DefaultSettingsLocal()
settings.Recorder = nil settings.Recorder = nil
settings.GradientThreshold = 1e-12 settings.GradientThreshold = 1e-12
settings.FunctionConverge = nil settings.FunctionConverge = nil

5
optimize/types.go
View File

@@ -242,8 +242,9 @@ type Settings struct {
Concurrent int Concurrent int
} }
// DefaultSettings returns a new Settings struct containing the default settings. // DefaultSettingsLocal returns a new Settings struct that contains default settings
func DefaultSettings() *Settings { // for running a local optimization.
func DefaultSettingsLocal() *Settings {
return &Settings{ return &Settings{
GradientThreshold: defaultGradientAbsTol, GradientThreshold: defaultGradientAbsTol,
FunctionThreshold: math.Inf(-1), FunctionThreshold: math.Inf(-1),

4
optimize/unconstrained_test.go
View File

@@ -1160,7 +1160,7 @@ func testLocal(t *testing.T, tests []unconstrainedTest, method GlobalMethod) {
continue continue
} }
settings := DefaultSettings() settings := DefaultSettingsLocal()
settings.Recorder = nil settings.Recorder = nil
if method != nil && method.Needs().Gradient { if method != nil && method.Needs().Gradient {
// Turn off function convergence checks for gradient-based methods. // Turn off function convergence checks for gradient-based methods.
@@ -1314,7 +1314,7 @@ func TestNelderMeadOneD(t *testing.T) {
} }
x := []float64{10} x := []float64{10}
m := &NelderMead{} m := &NelderMead{}
s := DefaultSettings() s := DefaultSettingsLocal()
s.InitX = x s.InitX = x
result, err := Global(p, len(x), s, m) result, err := Global(p, len(x), s, m)
if err != nil { if err != nil {