*** fminsearchorig.m Thu Mar 25 13:57:50 2010 --- fminsearch.m Thu Aug 26 12:52:00 2010 *************** *** 21,31 **** ## @seealso{fmin,fmins,nmsmax} ## @end deftypefn ! function [x fval] = fminsearch(funfun, X0, options, grad, varargin) ! if (nargin == 0); usage('[x fval] = fminsearch(funfun, X0, options, grad, varargin)'); end if (nargin < 3); options=[]; end ! if (nargin < 4); grad=[]; end ! if (nargin < 5); varargin={}; end x = fmins(funfun, X0, options, grad, varargin{:}); fval = feval(funfun, x, varargin{:}); endfunction; --- 21,31 ---- ## @seealso{fmin,fmins,nmsmax} ## @end deftypefn ! function [x fval] = fminsearch(funfun, X0, options, varargin) ! if (nargin == 0); usage('[x fval] = fminsearch(funfun, X0, options, varargin)'); end if (nargin < 3); options=[]; end ! if (nargin < 4); varargin={}; end ! grad=[]; x = fmins(funfun, X0, options, grad, varargin{:}); fval = feval(funfun, x, varargin{:}); endfunction;