From: Michael C. <mc...@us...> - 2004-05-18 11:55:15
|
Update of /cvsroot/octave/octave-forge/main/optim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7133/main/optim Modified Files: mdsmax.m Log Message: fix crash when stopit is not provided (failure to use default) Index: mdsmax.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/optim/mdsmax.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mdsmax.m 4 May 2003 23:58:47 -0000 1.2 +++ mdsmax.m 18 May 2004 11:55:07 -0000 1.3 @@ -54,7 +54,11 @@ theta = 0.5; % Contraction factor. % Set up convergence parameters etc. -if nargin < 3 | isempty(stopit), stopit(1) = 1e-3; end +if nargin < 3 + stopit(1) = 1e-3; +elseif isempty(stopit) + stopit(1) = 1e-3; +endif tol = stopit(1); % Tolerance for cgce test based on relative size of simplex. if length(stopit) == 1, stopit(2) = inf; end % Max no. of f-evaluations. if length(stopit) == 2, stopit(3) = inf; end % Default target for f-values. |