Author: bugman Date: Mon Nov 10 13:57:51 2014 New Revision: 26478 URL: http://svn.gna.org/viewcvs/relax?rev=26478&view=rev Log: Merged revisions 26395 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26395 | bugman | 2014-10-28 19:47:10 +0100 (Tue, 28 Oct 2014) | 3 lines Small indexing fixes for the dispersion chapter of the relax manual. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/docs/latex/dispersion.tex Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Nov 10 13:57:51 2014 @@ -1 +1 @@ -/trunk:1-26385 +/trunk:1-26477 Modified: branches/frame_order_cleanup/docs/latex/dispersion.tex URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/dispersion.tex?rev=26478&r1=26477&r2=26478&view=diff ============================================================================== --- branches/frame_order_cleanup/docs/latex/dispersion.tex (original) +++ branches/frame_order_cleanup/docs/latex/dispersion.tex Mon Nov 10 13:57:51 2014 @@ -2593,7 +2593,7 @@ The number of grid search increments may be decreased, but only after careful checking with a higher number of increments. Setting this value too low may place the initial optimisation too far away from the minimum. Although as-of-yet undetected and unpublished, if multiple local minima do exist then optimisation may not reach the global minimum. -Too little grid search increments can also cause the total optimisation time to increase as the Nelder-Mead simplex\index{optimisation!simplex algorithm}\index{optimisation!Nelder-Mead algorithm} optimisation together with the Logarithmic-barrier penalty function\index{optimisation!logarithmic-barrier penalty function} as used in the auto-analysis may require more time to reach the minimum. +Too little grid search increments can also cause the total optimisation time to increase as the Nelder-Mead simplex\index{optimisation!algorithm!Nelder-Mead simplex} optimisation together with the Logarithmic-barrier penalty function\index{optimisation!constraint algorithm!Logarithmic barrier} as used in the auto-analysis may require more time to reach the minimum. The Monte Carlo simulation\index{Monte Carlo simulation} number \pycode{MC\_NUM} variable affects the error estimate precision: