Added manual for plotting functions

6 files changed, 33 insertions, 11 deletions

diff --git a/scilab_doc/neldermead/fminsearch-so.pdf b/scilab_doc/neldermead/fminsearch-so.pdf
index 5973dce8..22f5123 100644
--- a/scilab_doc/neldermead/fminsearch-so.pdf
+++ b/scilab_doc/neldermead/fminsearch-so.pdf
diff --git a/scilab_doc/neldermead/fminsearch.tex b/scilab_doc/neldermead/fminsearch.tex
index 191541b..4545f5e 100644
--- a/scilab_doc/neldermead/fminsearch.tex
+++ b/scilab_doc/neldermead/fminsearch.tex
@@ -301,12 +301,6 @@ precision is both these softwares is $\epsilon \approx 10^{-16}$.
 That implies that there are approximately 16 significant digits.
 Therefore, the relative error on $x$, which is equivalent to 15
 significant digits, is acceptable. 
-If we now consider the relative error on $f$, which is equivalent 
-to only 8 significant digits, that may sound as a problem.
-This corresponds to the square root of the relative precision,
-because $\sqrt{\epsilon} = \approx 10^{-8}$.
-In fact, this is the best that we can expect from an optimization
-algorithm (\cite{Brent73algorithmsfor,Gill81MurrayWright}). 
 
 Therefore, the result is as close as possible to the result produced 
 by Matlab. More specifically :
@@ -666,3 +660,32 @@ The comparison between the figures \ref{fig-fminsearch-matlab-optimplotfval} and
 very similar plots. Notice that Scilab's \scifunction{fminsearch} does not 
 provide the "Stop" and "Pause" buttons.
 
+The figures \ref{fig-fminsearch-scilab-optimplotx} and \ref{fig-fminsearch-scilab-optimplotfunccount}
+present the results of Scilab's \scifunction{optimplotx} and \scifunction{optimplotfunccount}
+functions.
+
+\begin{figure}
+\begin{center}
+\includegraphics[width=10cm]{testFminsearchOptimplotxScilab.png}
+\end{center}
+\caption{Plot produced by Scilab's fminsearch, with the \scifunction{optimplotx} function.}
+\label{fig-fminsearch-scilab-optimplotx}
+\end{figure}
+
+\begin{figure}
+\begin{center}
+\includegraphics[width=10cm]{testFminsearchOptimplotfunccountScilab.png}
+\end{center}
+\caption{Plot produced by Scilab's fminsearch, with the \scifunction{optimplotfunccount} function.}
+\label{fig-fminsearch-scilab-optimplotfunccount}
+\end{figure}
+
+\section{Conclusion}
+
+The current version of Scilab's \scifunction{fminsearch} provides the same algorithm
+as Matlab's \scifunction{fminsearch}. The numerical precision is the same.
+The \scifunction{optimset} and \scifunction{optimget} functions allows to configure the optimization, 
+as well as the output and plotting function.
+Pre-defined plotting function allows to get a fast and nice plot of the optimization.
+
+
diff --git a/scilab_doc/neldermead/scripts/fminsearch_demo.m b/scilab_doc/neldermead/scripts/fminsearch_demo.m
index 41f8365..4b72498 100644
--- a/scilab_doc/neldermead/scripts/fminsearch_demo.m
+++ b/scilab_doc/neldermead/scripts/fminsearch_demo.m
@@ -60,19 +60,18 @@ opt = optimset('Display','iter' , 'MaxIter' , 10 );
 % Sample use of an output function
 options = optimset('OutputFcn', @outfun);
 hold on
-objfun=@(x) exp(x(1))*(4*x(1)^2+2*x(2)^2+x(1)*x(2)+2*x(2));
-[x fval] = fminsearch(objfun, [-1 1], options)
+[x fval] = fminsearch(objfun, [-1.2, 1], options)
 hold off
 
 % Sample use of a plot function : optimplotfval
 options = optimset('PlotFcns',@optimplotfval);
-[x ffinal] = fminsearch(@onehump,[2,1],options)
+[x ffinal] = fminsearch(banana,[-1.2, 1],options)
 
 % Sample use of a plot function : optimplotx
 options = optimset('PlotFcns',@optimplotx);
-[x ffinal] = fminsearch(@onehump,[2,1],options)
+[x ffinal] = fminsearch(banana,[-1.2, 1],options)
 
 % Sample use of a plot function : optimplotfunccount
 options = optimset('PlotFcns',@optimplotfunccount);
-[x ffinal] = fminsearch(@onehump,[2,1],options)
+[x ffinal] = fminsearch(banana,[-1.2, 1],options)
 
diff --git a/scilab_doc/neldermead/testFminsearchOptimplotfunccountScilab.png b/scilab_doc/neldermead/testFminsearchOptimplotfunccountScilab.png
new file mode 100644
index 0000000..28ca428
--- /dev/null
+++ b/scilab_doc/neldermead/testFminsearchOptimplotfunccountScilab.png
diff --git a/scilab_doc/neldermead/testFminsearchOptimplotxMatlab.png b/scilab_doc/neldermead/testFminsearchOptimplotxMatlab.png
new file mode 100644
index 0000000..9ef102a
--- /dev/null
+++ b/scilab_doc/neldermead/testFminsearchOptimplotxMatlab.png
diff --git a/scilab_doc/neldermead/testFminsearchOptimplotxScilab.png b/scilab_doc/neldermead/testFminsearchOptimplotxScilab.png
new file mode 100644
index 0000000..7697c0e
--- /dev/null
+++ b/scilab_doc/neldermead/testFminsearchOptimplotxScilab.png