From: stevenj <stevenj@alum.mit.edu>
Date: Mon, 7 Mar 2011 19:37:28 +0000 (-0500)
Subject: use elimdim for praxis, nelder mead, and sbplx
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19240dd865741952580cd3ba51abf0bb1212afd7;p=nlopt.git

use elimdim for praxis, nelder mead, and sbplx

darcs-hash:20110307193728-c8de0-19aaeaee247e0487cd6a0994c53614506fe7e3af.gz
---

diff --git a/api/optimize.c b/api/optimize.c
index edb162b..2a41334 100644
--- a/api/optimize.c
+++ b/api/optimize.c
@@ -209,7 +209,7 @@ static unsigned elimdim_dimension(unsigned n, const double *lb, const double *ub
      return n0;
 }
 
-/* modify v to "shrunk" version, with dimensions for lb[i] == ub[i] eliminated */
+/* modify v to "shrunk" version, with dimensions for lb[i] == ub[i] elim'ed */
 static void elimdim_shrink(unsigned n, double *v,
 			   const double *lb, const double *ub)
 {
@@ -322,10 +322,13 @@ static int elimdim_wrapcheck(nlopt_opt opt)
 	 case NLOPT_GN_DIRECT_L_RAND_NOSCAL: 
 	 case NLOPT_GN_ORIG_DIRECT:
 	 case NLOPT_GN_ORIG_DIRECT_L:
+	 case NLOPT_LN_PRAXIS:
 	 case NLOPT_LN_COBYLA:
 	 case NLOPT_LN_NEWUOA:
 	 case NLOPT_LN_NEWUOA_BOUND:
 	 case NLOPT_LN_BOBYQA:
+	 case NLOPT_LN_NELDERMEAD:
+	 case NLOPT_LN_SBPLX:
 	 case NLOPT_GN_ISRES:
 	      return 1;