From: stevenj Date: Tue, 29 Jul 2008 17:48:20 +0000 (-0400) Subject: name tweak X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19a11f7bf24f016e8514352d753a182a152154a7;p=nlopt.git name tweak darcs-hash:20080729174820-c8de0-183125f530d054805da4f7a92eb45a57b58ba18b.gz --- diff --git a/api/nlopt.c b/api/nlopt.c index 6ad36f3..71570bd 100644 --- a/api/nlopt.c +++ b/api/nlopt.c @@ -63,7 +63,7 @@ static const char nlopt_algorithm_names[NLOPT_NUM_ALGORITHMS][256] = { #else "original NON-FREE L-BFGS code by Nocedal et al. (NOT COMPILED)", #endif - "Low-storage BFGS (LBFGS) (local, derivative-based)", + "Limited-memory BFGS (L-BFGS) (local, derivative-based)", "Principal-axis, praxis (local, no-derivative)", "Limited-memory variable-metric, rank 1 (local, derivative-based)", "Limited-memory variable-metric, rank 2 (local, derivative-based)", diff --git a/api/nlopt_minimize.3 b/api/nlopt_minimize.3 index 22f795f..0e6631c 100644 --- a/api/nlopt_minimize.3 +++ b/api/nlopt_minimize.3 @@ -251,8 +251,8 @@ optimization, although bound constraints are supported too (via a potentially inefficient method). .TP .B NLOPT_LD_LBFGS -Local (L) gradient-based (D) optimization using the low-storage BFGS -(LBFGS) algorithm. (The objective function must supply the +Local (L) gradient-based (D) optimization using the limited-memory BFGS +(L-BFGS) algorithm. (The objective function must supply the gradient.) Unconstrained optimization is supported in addition to simple bound constraints (see above). Based on an implementation by Luksan et al. diff --git a/octave/NLOPT_LD_LBFGS.m b/octave/NLOPT_LD_LBFGS.m index 7a81af3..a926f7b 100644 --- a/octave/NLOPT_LD_LBFGS.m +++ b/octave/NLOPT_LD_LBFGS.m @@ -1,4 +1,4 @@ -% NLOPT_LD_LBFGS: Low-storage BFGS (LBFGS) (local, derivative-based) +% NLOPT_LD_LBFGS: Limited-memory BFGS (L-BFGS) (local, derivative-based) % % See nlopt_minimize for more information. function val = NLOPT_LD_LBFGS