From: stevenj <stevenj@alum.mit.edu>
Date: Fri, 20 Jul 2012 20:14:33 +0000 (-0400)
Subject: added CCSAQ to man page
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=216238cda934a1826f70167dfa146a26ad11c7aa;p=nlopt.git

added CCSAQ to man page

Ignore-this: d7cc44e91dfde8a60b9ea54173327a16

darcs-hash:20120720201433-c8de0-abc78a67b2435a6d7761da6fcf2f97d26f5c36f0.gz
---

diff --git a/api/nlopt.3 b/api/nlopt.3
index 72fafd6..a6cbd0c 100644
--- a/api/nlopt.3
+++ b/api/nlopt.3
@@ -434,11 +434,14 @@ criteria/tolerances for the local searches, by
 with or without derivatives, and determines whether the objective
 function needs gradients.)
 .TP
-.B NLOPT_LD_MMA
+\fBNLOPT_LD_MMA\fR, \fBNLOPT_LD_CCSAQ\fR 
 Local (L) gradient-based (D) optimization using the method of moving
 asymptotes (MMA), or rather a refined version of the algorithm as
 published by Svanberg (2002).  (NLopt uses an independent
-free-software/open-source implementation of Svanberg's algorithm.)
+free-software/open-source implementation of Svanberg's algorithm.) CCSAQ
+is a related algorithm from Svanberg's paper which uses a local quadratic
+approximation rather than the more-complicated MMA model; the two usually
+have similar convergence rates.
 The
 .B NLOPT_LD_MMA
 algorithm supports both bound-constrained and unconstrained