From: stevenj Date: Wed, 12 May 2010 15:01:53 +0000 (-0400) Subject: fixed Matlab plugin X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a14002ac6029b8d9e5a578704a2c5605ff3225a4;p=nlopt.git fixed Matlab plugin darcs-hash:20100512150153-c8de0-b50f3e7a70cd3b834eef51b8b3123df0ee83dacb.gz --- diff --git a/octave/nlopt_optimize-mex.c b/octave/nlopt_optimize-mex.c index 4956192..cde3a44 100644 --- a/octave/nlopt_optimize-mex.c +++ b/octave/nlopt_optimize-mex.c @@ -146,9 +146,9 @@ nlopt_opt make_opt(const mxArray *opts, unsigned n) nlopt_set_xtol_rel(opt, struct_val_default(opts, "xtol_rel", 0.0)); nlopt_set_xtol_abs(opt, struct_arrval(opts, "xtol_abs", n, fill(tmp, n, 0.0))); - nlopt_set_xtol_rel(opt, struct_val_default(opts, "maxeval", 0.0) < 0 ? - 0 : struct_val_default(opts, "maxeval", 0.0)); - nlopt_set_xtol_rel(opt, struct_val_default(opts, "maxtime", 0.0)); + nlopt_set_maxeval(opt, struct_val_default(opts, "maxeval", 0.0) < 0 ? + 0 : struct_val_default(opts, "maxeval", 0.0)); + nlopt_set_maxtime(opt, struct_val_default(opts, "maxtime", 0.0)); nlopt_set_population(opt, struct_val_default(opts, "population", 0));