diff options
author | Michaël Baudin <michael.baudin@scilab.org> | 2010-02-03 14:50:00 +0100 |
---|---|---|
committer | Michaël Baudin <michael.baudin@scilab.org> | 2010-02-03 14:50:00 +0100 |
commit | 0536fb8703103394f7c24af51caf3198c6730062 (patch) | |
tree | 36d692bdcff388638657bde761a0c2318706bba2 /scilab_doc | |
parent | 335462d0ce79a7e8d961955fdee026c4d0d040b2 (diff) | |
download | scilab-0536fb8703103394f7c24af51caf3198c6730062.zip scilab-0536fb8703103394f7c24af51caf3198c6730062.tar.gz |
neldermead: Fixed bug #6543
Diffstat (limited to 'scilab_doc')
-rw-r--r-- | scilab_doc/neldermead/neldermeadmethod/method-neldermead.tex | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scilab_doc/neldermead/neldermeadmethod/method-neldermead.tex b/scilab_doc/neldermead/neldermeadmethod/method-neldermead.tex index 7c935cb..549636a 100644 --- a/scilab_doc/neldermead/neldermeadmethod/method-neldermead.tex +++ b/scilab_doc/neldermead/neldermeadmethod/method-neldermead.tex | |||
@@ -420,9 +420,6 @@ The algorithm is presented in figure \ref{algo-factorialtest}. | |||
420 | \STATE $istorestart = FALSE$ | 420 | \STATE $istorestart = FALSE$ |
421 | \FOR{$i = 1$ to $n$} | 421 | \FOR{$i = 1$ to $n$} |
422 | \STATE $\delta = step ( i ) * \epsilon$ | 422 | \STATE $\delta = step ( i ) * \epsilon$ |
423 | \IF { $\delta == 0.0$ } | ||
424 | \STATE $\delta = \epsilon$ | ||
425 | \ENDIF | ||
426 | \STATE $x ( i ) = x ( i ) + \delta$ | 423 | \STATE $x ( i ) = x ( i ) + \delta$ |
427 | \STATE $fv = f ( x ) $ | 424 | \STATE $fv = f ( x ) $ |
428 | \IF { $ fv < fopt $} | 425 | \IF { $ fv < fopt $} |
@@ -442,8 +439,7 @@ The algorithm is presented in figure \ref{algo-factorialtest}. | |||
442 | \label{algo-factorialtest} | 439 | \label{algo-factorialtest} |
443 | \end{figure} | 440 | \end{figure} |
444 | 441 | ||
445 | O'Neill's factorial test requires a large number of function evaluations, namely | 442 | O'Neill's factorial test requires $2n$ function evaluations. In O'Neill's implementation, the parameter |
446 | $2^n$ function evaluations. In O'Neill's implementation, the parameter | ||
447 | $\epsilon$ is set to the constant value $1.e-3$. | 443 | $\epsilon$ is set to the constant value $1.e-3$. |
448 | In Scilab's implementation, this parameter can be customized, | 444 | In Scilab's implementation, this parameter can be customized, |
449 | thanks to the \scivar{-restarteps} option. Its default value is \scivar{\%eps}, | 445 | thanks to the \scivar{-restarteps} option. Its default value is \scivar{\%eps}, |