Skip to content

Commit 785d085

Browse files
committed
Added documentation for missing advanced setting
1 parent 47c15c0 commit 785d085

File tree

14 files changed

+92
-84
lines changed

14 files changed

+92
-84
lines changed
1.11 KB
Binary file not shown.
759 Bytes
Binary file not shown.

docs/_build/html/_sources/advanced.rst.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Multiple Restarts
7777
* :code:`restarts.hard.increase_ndirs_initial_amt` - Amount to increase :code:`growing.ndirs_initial` by with each hard restart. To avoid a growing phase, it is best to set it to the same value as :code:`restarts.increase_npt_amt`. Default is 1.
7878
* :code:`restarts.hard.use_old_rk` - If using hard restarts, whether or not to recycle the objective value at the best iterate found when performing a restart. This saves one objective evaluation. Default is :code:`True`.
7979
* :code:`restarts.max_npt` - Maximum allowed value of :math:`|Y_k|`, useful if increasing with each restart. Default is :code:`npt`, the input parameter to :code:`dfols.solve()`.
80+
* :code:`restarts.soft.max_fake_successful_steps` - The maximum number of successful steps in a given run where the new (smaller) objective value is larger than the best value found in a previous run. Default is :code:`maxfun`, the input to :code:`dfols.solve()`.
8081
* :code:`restarts.auto_detect` - Whether or not to automatically determine when to restart. This is an extra condition, and restarts can still be triggered by small trust region radius, etc. Default is :code:`True`.
8182
* :code:`restarts.auto_detect.history` - How many iterations of data on model changes and trust region radii to store. There are two criteria used: trust region radius decreases (no increases over the history, more decreases than no changes), and change in model Jacobian (consistently increasing trend as measured by slope and correlation coefficient of line of best fit). Default is 30.
8283
* :code:`restarts.auto_detect.min_chgJ_slope` - Minimum rate of increase of :math:`\log(\|J_k-J_{k-1}\|_F)` over the past iterations to cause a restart. Default is 0.015.

docs/_build/html/advanced.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<div class="section" id="advanced-usage">
4545
<h1>Advanced Usage<a class="headerlink" href="#advanced-usage" title="Permalink to this headline"></a></h1>
4646
<p>This section describes different optional user parameters available in DFO-LS.</p>
47-
<p>In the last section (<a class="reference internal" href="userguide.html"><span class="doc">Using DFO-LS</span></a>), we introduced <code class="code docutils literal"><span class="pre">dfols.solve()</span></code>, which has the optional input <code class="code docutils literal"><span class="pre">user_params</span></code>. This is a Python dictionary of user parameters. We will now go through the settings which can be changed in this way. More details are available in the paper <a class="reference internal" href="userguide.html#cfmr2018" id="id1">[CFMR2018]</a>.</p>
47+
<p>In the last section (<a class="reference internal" href="userguide.html"><span class="doc">Using DFO-LS</span></a>), we introduced <code class="code docutils literal"><span class="pre">dfols.solve()</span></code>, which has the optional input <code class="code docutils literal"><span class="pre">user_params</span></code>. This is a Python dictionary of user parameters. We will now go through the settings which can be changed in this way. More details are available in the paper <a class="reference internal" href="#cfmr2018" id="id1">[CFMR2018]</a>.</p>
4848
<p>The default values, used if no override is given, in some cases vary depending on whether <code class="code docutils literal"><span class="pre">objfun</span></code> has stochastic noise; that is, whether evaluating <code class="code docutils literal"><span class="pre">objfun(x)</span></code> several times at the same <code class="code docutils literal"><span class="pre">x</span></code> gives the same result or not. Whether or not this is the case is determined by the <code class="code docutils literal"><span class="pre">objfun_has_noise</span></code> input to <code class="code docutils literal"><span class="pre">dfols.solve()</span></code> (and not by inspecting <code class="code docutils literal"><span class="pre">objfun</span></code>, for instance).</p>
4949
<div class="section" id="general-algorithm-parameters">
5050
<h2>General Algorithm Parameters<a class="headerlink" href="#general-algorithm-parameters" title="Permalink to this headline"></a></h2>
@@ -136,6 +136,7 @@ <h2>Multiple Restarts<a class="headerlink" href="#multiple-restarts" title="Perm
136136
<li><code class="code docutils literal"><span class="pre">restarts.hard.increase_ndirs_initial_amt</span></code> - Amount to increase <code class="code docutils literal"><span class="pre">growing.ndirs_initial</span></code> by with each hard restart. To avoid a growing phase, it is best to set it to the same value as <code class="code docutils literal"><span class="pre">restarts.increase_npt_amt</span></code>. Default is 1.</li>
137137
<li><code class="code docutils literal"><span class="pre">restarts.hard.use_old_rk</span></code> - If using hard restarts, whether or not to recycle the objective value at the best iterate found when performing a restart. This saves one objective evaluation. Default is <code class="code docutils literal"><span class="pre">True</span></code>.</li>
138138
<li><code class="code docutils literal"><span class="pre">restarts.max_npt</span></code> - Maximum allowed value of <span class="math">\(|Y_k|\)</span>, useful if increasing with each restart. Default is <code class="code docutils literal"><span class="pre">npt</span></code>, the input parameter to <code class="code docutils literal"><span class="pre">dfols.solve()</span></code>.</li>
139+
<li><code class="code docutils literal"><span class="pre">restarts.soft.max_fake_successful_steps</span></code> - The maximum number of successful steps in a given run where the new (smaller) objective value is larger than the best value found in a previous run. Default is <code class="code docutils literal"><span class="pre">maxfun</span></code>, the input to <code class="code docutils literal"><span class="pre">dfols.solve()</span></code>.</li>
139140
<li><code class="code docutils literal"><span class="pre">restarts.auto_detect</span></code> - Whether or not to automatically determine when to restart. This is an extra condition, and restarts can still be triggered by small trust region radius, etc. Default is <code class="code docutils literal"><span class="pre">True</span></code>.</li>
140141
<li><code class="code docutils literal"><span class="pre">restarts.auto_detect.history</span></code> - How many iterations of data on model changes and trust region radii to store. There are two criteria used: trust region radius decreases (no increases over the history, more decreases than no changes), and change in model Jacobian (consistently increasing trend as measured by slope and correlation coefficient of line of best fit). Default is 30.</li>
141142
<li><code class="code docutils literal"><span class="pre">restarts.auto_detect.min_chgJ_slope</span></code> - Minimum rate of increase of <span class="math">\(\log(\|J_k-J_{k-1}\|_F)\)</span> over the past iterations to cause a restart. Default is 0.015.</li>

docs/_build/html/objects.inv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
# Project: DFO-LS
33
# Version: 1.0
44
# The remainder of this file is compressed using zlib.
5-
x�mQ�j�0��+�U�ɩ�V0�@� ����΂�$����lٵ�I�3�� �F�d>ȣ���=�{�����x��c%:�O��I���(<�~ ���a�x% zc} ��^��^�����Ț�GCF�W�eA��<>��6o�0�S�/���(&���Ys��K���~ �г+�q�cP�Tzw6[7]$�L@��5AK��C���T��n��e��W+����[��X&�y�:6���6SYP�r�����
5+
x�m��j�0��z
6+
A{Uiz*�L ����l�����T�՟��mٵM{�f��!P�D�cR{�%;��pM�𗙸D��dk����y4xC��rw�S���H����W ut�y�4:r
7+
?�Kf�X�Ñ-شaET�Z��=�0P�3�C@��-��o ���O1�潃�����R��J��֗�:cȄ=��Fin9^���^��ۗ��x��38�2"y�:�V��_��"ݑ�u�_��*����&

docs/_build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/_build/latex/DFOLS.aux

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
\@writefile{toc}{\contentsline {chapter}{\numberline {1}Installing DFO-LS}{3}{chapter.1}}
2525
\@writefile{lof}{\addvspace {10\p@ }}
2626
\@writefile{lot}{\addvspace {10\p@ }}
27-
\newlabel{install::doc}{{1}{3}{Installing DFO-LS}{chapter.1}{}}
2827
\newlabel{install:installing-dfo-ls}{{1}{3}{Installing DFO-LS}{chapter.1}{}}
28+
\newlabel{install::doc}{{1}{3}{Installing DFO-LS}{chapter.1}{}}
2929
\newlabel{install:dfo-ls-derivative-free-optimizer-for-least-squares-minimization}{{1}{3}{Installing DFO-LS}{chapter.1}{}}
3030
\@writefile{toc}{\contentsline {section}{\numberline {1.1}Requirements}{3}{section.1.1}}
3131
\newlabel{install:requirements}{{1.1}{3}{Requirements}{section.1.1}{}}
@@ -40,8 +40,8 @@
4040
\@writefile{toc}{\contentsline {chapter}{\numberline {2}Overview}{5}{chapter.2}}
4141
\@writefile{lof}{\addvspace {10\p@ }}
4242
\@writefile{lot}{\addvspace {10\p@ }}
43-
\newlabel{info::doc}{{2}{5}{Overview}{chapter.2}{}}
4443
\newlabel{info:overview}{{2}{5}{Overview}{chapter.2}{}}
44+
\newlabel{info::doc}{{2}{5}{Overview}{chapter.2}{}}
4545
\@writefile{toc}{\contentsline {section}{\numberline {2.1}When to use DFO-LS}{5}{section.2.1}}
4646
\newlabel{info:when-to-use-dfo-ls}{{2.1}{5}{When to use DFO-LS}{section.2.1}{}}
4747
\@writefile{toc}{\contentsline {section}{\numberline {2.2}Parameter Fitting}{5}{section.2.2}}
@@ -80,8 +80,8 @@
8080
\@writefile{toc}{\contentsline {chapter}{\numberline {4}Advanced Usage}{19}{chapter.4}}
8181
\@writefile{lof}{\addvspace {10\p@ }}
8282
\@writefile{lot}{\addvspace {10\p@ }}
83-
\newlabel{advanced::doc}{{4}{19}{Advanced Usage}{chapter.4}{}}
8483
\newlabel{advanced:advanced-usage}{{4}{19}{Advanced Usage}{chapter.4}{}}
84+
\newlabel{advanced::doc}{{4}{19}{Advanced Usage}{chapter.4}{}}
8585
\newlabel{advanced:id1}{{4}{19}{Advanced Usage}{section*.5}{}}
8686
\@writefile{toc}{\contentsline {section}{\numberline {4.1}General Algorithm Parameters}{19}{section.4.1}}
8787
\newlabel{advanced:general-algorithm-parameters}{{4.1}{19}{General Algorithm Parameters}{section.4.1}{}}

docs/_build/latex/DFOLS.fdb_latexmk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Fdb version 3
2-
["makeindex DFOLS.idx"] 1517840619 "DFOLS.idx" "DFOLS.ind" "DFOLS" 1517845150
3-
"DFOLS.idx" 1517845149 0 d41d8cd98f00b204e9800998ecf8427e ""
2+
["makeindex DFOLS.idx"] 1517840619 "DFOLS.idx" "DFOLS.ind" "DFOLS" 1517847736
3+
"DFOLS.idx" 1517847735 0 d41d8cd98f00b204e9800998ecf8427e ""
44
(generated)
5-
"DFOLS.ilg"
65
"DFOLS.ind"
7-
["pdflatex"] 1517845148 "DFOLS.tex" "DFOLS.pdf" "DFOLS" 1517845150
6+
"DFOLS.ilg"
7+
["pdflatex"] 1517847734 "DFOLS.tex" "DFOLS.pdf" "DFOLS" 1517847736
88
"/etc/texmf/web2c/texmf.cnf" 1492166151 1353 1689cc21eed27d7ad1e0e829b373fbdd ""
99
"/usr/share/texlive/texmf-dist/fonts/enc/dvips/base/8r.enc" 1165713224 4850 80dc9bab7f31fb78a000ccfed0e27cab ""
1010
"/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1272929888 3287 e6b82fe08f5336d4d5ebc73fb1152e87 ""
@@ -164,21 +164,21 @@
164164
"/usr/share/texmf/web2c/texmf.cnf" 1503343927 31343 93828589fb0cea665e553ee5a17ad2d4 ""
165165
"/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1503486108 1865826 00f4fd43c6ed441c7927291bb1fbfb80 ""
166166
"/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1503486128 3855763 e8af73c60cd2ba414e67cfc4c101393d ""
167-
"DFOLS.aux" 1517845149 10286 a80175ca63c7343b2392b7d3aaec8eb8 ""
167+
"DFOLS.aux" 1517847736 10286 cb363f6363b3adeb235cbb5318ca4f6f ""
168168
"DFOLS.ind" 1517840619 0 d41d8cd98f00b204e9800998ecf8427e "makeindex DFOLS.idx"
169-
"DFOLS.out" 1517845149 7064 3dd946e4adfeda36993db09d2fce2a6a ""
170-
"DFOLS.tex" 1517845142 69072 dcabc11238cb722bea0b585a6488b55f ""
171-
"DFOLS.toc" 1517845149 3469 7338296352409c6ccf29ce2e3ff18265 ""
169+
"DFOLS.out" 1517847736 7064 3dd946e4adfeda36993db09d2fce2a6a ""
170+
"DFOLS.tex" 1517847732 69360 d802f20cff3d15a1160fcbd96d65c96b ""
171+
"DFOLS.toc" 1517847736 3469 7338296352409c6ccf29ce2e3ff18265 ""
172172
"data_fitting.png" 1517839082 29893 211bb1c28ea25d47c8c0990fbf39c55c ""
173173
"footnotehyper-sphinx.sty" 1501773881 8841 e18cbb7bca599a223414f9b8a156abee ""
174174
"sphinx.sty" 1501773881 62669 cc7c90932531415fb6bb849a3b8348a6 ""
175-
"sphinxhighlight.sty" 1517845141 8137 9756fef4d5a85023c16244034671f6f6 ""
175+
"sphinxhighlight.sty" 1517847732 8137 5555fd04227a2c0be30deb7e1ec9a314 ""
176176
"sphinxmanual.cls" 1501773881 3589 0b0aac49c6f36925cf5f9d524a75a978 ""
177177
"sphinxmulticell.sty" 1501773881 14618 0defbdc8536ad2e67f1eac6a1431bc55 ""
178178
(generated)
179-
"DFOLS.out"
180-
"DFOLS.aux"
181179
"DFOLS.log"
182-
"DFOLS.toc"
183180
"DFOLS.idx"
181+
"DFOLS.toc"
184182
"DFOLS.pdf"
183+
"DFOLS.aux"
184+
"DFOLS.out"

docs/_build/latex/DFOLS.log

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017.8.23) 5 FEB 2018 15:39
1+
This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2017.8.23) 5 FEB 2018 16:22
22
entering extended mode
33
restricted \write18 enabled.
44
%&-line parsing enabled.
@@ -1211,26 +1211,26 @@ Chapter 6.
12111211
] [28
12121212

12131213
] (./DFOLS.ind)
1214-
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1246.
1214+
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1249.
12151215
[29
12161216

12171217
pdfTeX warning (ext4): destination with the same identifier (name{cite.CFMR2018
12181218
}) has been already used, duplicate ignored
12191219

12201220
\AtBegShi@Output ...ipout \box \AtBeginShipoutBox
12211221
\fi \fi
1222-
l.1246 \end{document}
1222+
l.1249 \end{document}
12231223
pdfTeX warning (ext4): destination with the same identifie
12241224
r (name{cite.CFMR2018}) has been already used, duplicate ignored
12251225

12261226
\AtBegShi@Output ...ipout \box \AtBeginShipoutBox
12271227
\fi \fi
1228-
l.1246 \end{document}
1228+
l.1249 \end{document}
12291229
]
1230-
Package atveryend Info: Empty hook `AfterLastShipout' on input line 1246.
1230+
Package atveryend Info: Empty hook `AfterLastShipout' on input line 1249.
12311231
(./DFOLS.aux)
1232-
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1246.
1233-
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1246.
1232+
Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1249.
1233+
Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1249.
12341234

12351235
Package rerunfilecheck Info: File `DFOLS.out' has not changed.
12361236
(rerunfilecheck) Checksum: 3DD946E4ADFEDA36993DB09D2FCE2A6A;7064.
@@ -1266,7 +1266,7 @@ lvetic/uhvb8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/helvetic/uhvbo
12661266
8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/times/utmb8a.pfb></usr/sh
12671267
are/texlive/texmf-dist/fonts/type1/urw/times/utmr8a.pfb></usr/share/texlive/tex
12681268
mf-dist/fonts/type1/urw/times/utmri8a.pfb>
1269-
Output written on DFOLS.pdf (33 pages, 292802 bytes).
1269+
Output written on DFOLS.pdf (33 pages, 293108 bytes).
12701270
PDF statistics:
12711271
512 PDF objects out of 1000 (max. 8388607)
12721272
445 compressed objects within 5 object streams

docs/_build/latex/DFOLS.pdf

306 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)