Skip to content

Commit 6fc973f

Browse files
committed
Cleaned up regularization documentation and examples
1 parent f71b854 commit 6fc973f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1135
-877
lines changed

README.rst

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ See manual.pdf or `here <https://numericalalgorithmsgroup.github.io/dfols/>`_.
3434

3535
Citation
3636
--------
37-
If you use DFO-LS in a paper, please cite:
37+
The development of DFO-LS is outlined over several publications:
3838

39-
Cartis, C., Fiala, J., Marteau, B. and Roberts, L., `Improving the Flexibility and Robustness of Model-Based Derivative-Free Optimization Solvers <https://doi.org/10.1145/3338517>`_, *ACM Transactions on Mathematical Software*, 45:3 (2019), pp. 32:1-32:41.
39+
1. C. Cartis, J. Fiala, B. Marteau and L. Roberts, `Improving the Flexibility and Robustness of Model-Based Derivative-Free Optimization Solvers <https://doi.org/10.1145/3338517>`_, *ACM Transactions on Mathematical Software*, 45:3 (2019), pp. 32:1-32:41 [`preprint <https://arxiv.org/abs/1804.00154>`_] .
40+
2. M. Hough, and L. Roberts, `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579 [`preprint <https://arxiv.org/abs/2111.05443>`_].
41+
3. Y. Liu, K. H. Lam and L. Roberts, `Black-box Optimization Algorithms for Regularized Least-squares Problems <http://arxiv.org/abs/2407.14915>`_, *arXiv preprint arXiv:arXiv:2407.14915*, 2024.
4042

41-
If you use DFO-LS for problems with constraints, including bound constraints, please also cite:
42-
43-
Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579.
43+
If you use DFO-LS in a paper, please cite [1].
44+
If your problem has constraints, including bound constraints, please cite [1,2].
45+
If your problem includes a regularizer, please cite [1,3].
4446

4547
Requirements
4648
------------
@@ -70,27 +72,13 @@ For easy installation, use `pip <http://www.pip-installer.org/>`_ as root:
7072

7173
.. code-block:: bash
7274
73-
$ [sudo] pip install DFO-LS
74-
75-
or alternatively *easy_install*:
76-
77-
.. code-block:: bash
78-
79-
$ [sudo] easy_install DFO-LS
80-
81-
If you do not have root privileges or you want to install DFO-LS for your private use, you can use:
82-
83-
.. code-block:: bash
84-
85-
$ pip install --user DFO-LS
86-
87-
which will install DFO-LS in your home directory.
75+
$ pip install DFO-LS
8876
8977
Note that if an older install of DFO-LS is present on your system you can use:
9078

9179
.. code-block:: bash
9280
93-
$ [sudo] pip install --upgrade DFO-LS
81+
$ pip install --upgrade DFO-LS
9482
9583
to upgrade DFO-LS to the latest version.
9684

@@ -107,22 +95,14 @@ DFO-LS is written in pure Python and requires no compilation. It can be installe
10795

10896
.. code-block:: bash
10997
110-
$ [sudo] pip install .
111-
112-
If you do not have root privileges or you want to install DFO-LS for your private use, you can use:
113-
114-
.. code-block:: bash
115-
116-
$ pip install --user .
117-
118-
instead.
98+
$ pip install .
11999
120100
To upgrade DFO-LS to the latest version, navigate to the top-level directory (i.e. the one containing :code:`pyproject.toml`) and rerun the installation using :code:`pip`, as above:
121101

122102
.. code-block:: bash
123103
124104
$ git pull
125-
$ [sudo] pip install . # with admin privileges
105+
$ pip install .
126106
127107
Testing
128108
-------
@@ -145,7 +125,7 @@ If DFO-LS was installed using *pip* you can uninstall as follows:
145125

146126
.. code-block:: bash
147127
148-
$ [sudo] pip uninstall DFO-LS
128+
$ pip uninstall DFO-LS
149129
150130
If DFO-LS was installed manually you have to remove the installed files by hand (located in your python site-packages directory).
151131

dfols/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from __future__ import absolute_import, division, print_function, unicode_literals
4040

4141
# DFO-LS version
42-
__version__ = '1.4.1'
42+
__version__ = '1.5.0'
4343

4444
# Main solver & exit flags
4545
from .solver import *

docs/advanced.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Advanced Usage
22
==============
33
This section describes different optional user parameters available in DFO-LS.
44

5-
In the last section (:doc:`userguide`), we introduced :code:`dfols.solve()`, which has the optional input :code:`user_params`. 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 papers [CFMR2018]_ and [HR2022]_.
5+
In the last section (:doc:`userguide`), we introduced :code:`dfols.solve()`, which has the optional input :code:`user_params`. 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 papers [CFMR2018]_, [HR2022]_ and [LLR2024]_.
66

77
The default values, used if no override is given, in some cases vary depending on whether :code:`objfun` has stochastic noise; that is, whether evaluating :code:`objfun(x)` several times at the same :code:`x` gives the same result or not. Whether or not this is the case is determined by the :code:`objfun_has_noise` input to :code:`dfols.solve()` (and not by inspecting :code:`objfun`, for instance).
88

@@ -128,4 +128,7 @@ References
128128
Coralia Cartis, Jan Fiala, Benjamin Marteau and Lindon Roberts, `Improving the Flexibility and Robustness of Model-Based Derivative-Free Optimization Solvers <https://doi.org/10.1145/3338517>`_, *ACM Transactions on Mathematical Software*, 45:3 (2019), pp. 32:1-32:41 [`preprint <https://arxiv.org/abs/1804.00154>`_]
129129
130130
.. [HR2022]
131-
Hough, M. and Roberts, L., `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579 [`preprint <https://arxiv.org/abs/2111.05443>`_].
131+
Matthew Hough and Lindon Roberts, `Model-Based Derivative-Free Methods for Convex-Constrained Optimization <https://doi.org/10.1137/21M1460971>`_, *SIAM Journal on Optimization*, 21:4 (2022), pp. 2552-2579 [`preprint <https://arxiv.org/abs/2111.05443>`_].
132+
133+
.. [LLR2024]
134+
Yanjun Liu, Kevin H. Lam and Lindon Roberts, `Black-box Optimization Algorithms for Regularized Least-squares Problems <http://arxiv.org/abs/2407.14915>`_, *arXiv preprint arXiv:2407.14915* (2024).
2.22 KB
Binary file not shown.
1.04 KB
Binary file not shown.
32.7 KB
Binary file not shown.
1.05 KB
Binary file not shown.

docs/build/doctrees/index.doctree

9 Bytes
Binary file not shown.
-75 Bytes
Binary file not shown.
20.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)