default to COBYLA rather than subplex for local searches, since the latter doesn...

darcs-hash:20080901064050-c8de0-29a9cca7bc4ac2beec2976d64c1ed7fea96c97f4.gz

diff --git a/api/nlopt.c b/api/nlopt.c
index 554f65bd6bd1cefb80656555833144c36a0a5e6e..9109a7109f96dd1536fbb9654ec383bfb39379ea 100644 (file)
--- a/api/nlopt.c
+++ b/api/nlopt.c
@@ -234,7 +234,7 @@ static double f_direct(int n, const double *x, int *undefined, void *data_)
 
 /* default local-search algorithms */
 static nlopt_algorithm local_search_alg_deriv = NLOPT_LD_MMA;
-static nlopt_algorithm local_search_alg_nonderiv = NLOPT_LN_SUBPLEX;
+static nlopt_algorithm local_search_alg_nonderiv = NLOPT_LN_COBYLA;
 
 static int local_search_maxeval = -1; /* no maximum by default */
 

diff --git a/api/nlopt_minimize.3 b/api/nlopt_minimize.3
index f97d610bcedefddeec629663f79fc08c5506b98f..b257003698ac760148036f59b1a6a048471a326b 100644 (file)
--- a/api/nlopt_minimize.3
+++ b/api/nlopt_minimize.3
@@ -305,9 +305,9 @@ avoid multiple local searches for the same local minimum.  The local
 search uses the derivative/nonderivative algorithm set by
 .I nlopt_set_local_search_algorithm
 (currently defaulting to
-.I NLOPT_LD_LBFGS
+.I NLOPT_LD_MMA
 and
-.I NLOPT_LN_SUBPLEX
+.I NLOPT_LN_COBYLA
 for derivative/nonderivative searches, respectively).  There are also
 two other variants, \fBNLOPT_GD_MLSL\fR and \fBNLOPT_GN_MLSL\fR, which use
 pseudo-random numbers (instead of an LDS) as in the original MLSL algorithm.

diff --git a/api/nlopt_minimize_constrained.3 b/api/nlopt_minimize_constrained.3
index fe34d2574acf1c03ca6c534985ed4b69f50dab7b..b025d246570b6bf98291a79c116586ab7a04e69b 100644 (file)
--- a/api/nlopt_minimize_constrained.3
+++ b/api/nlopt_minimize_constrained.3
@@ -407,9 +407,9 @@ avoid multiple local searches for the same local minimum.  The local
 search uses the derivative/nonderivative algorithm set by
 .I nlopt_set_local_search_algorithm
 (currently defaulting to
-.I NLOPT_LD_LBFGS
+.I NLOPT_LD_MMA
 and
-.I NLOPT_LN_SUBPLEX
+.I NLOPT_LN_COBYLA
 for derivative/nonderivative searches, respectively).  There are also
 two other variants, \fBNLOPT_GD_MLSL\fR and \fBNLOPT_GN_MLSL\fR, which use
 pseudo-random numbers (instead of an LDS) as in the original MLSL algorithm.