Skip to content

Commit

Permalink
#71 Release v0.1.2.dev10; renaming, data misfit & lstsq improvements
Browse files Browse the repository at this point in the history
- Close #70 
- Close #68 
- Close #56
  • Loading branch information
jwhhh authored Oct 3, 2022
2 parents f8ec9c9 + bf57c16 commit 06106b0
Show file tree
Hide file tree
Showing 18 changed files with 648 additions and 493 deletions.
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@

<!--next-version-placeholder-->

## v0.1.2.dev10 (NOT YET RELEASED)
## v0.1.2.dev10 (03/10/2022)

### CoFI Core

- [#56](https://github.com/inlab-geo/cofi/issues/56) Modify BaseProblem.data_misfit to include data covariance matrix
- [#70](https://github.com/inlab-geo/cofi/issues/70) Words renaming optimise -> optimize, etc.

### CoFI Utils

- [#65](https://github.com/inlab-geo/cofi/issues/54) Utility functions using findiff to generate the difference matrices
- [#54](https://github.com/inlab-geo/cofi/issues/54) Utility functions using findiff to generate the difference matrices

### CoFI Solvers

- [#68](https://github.com/inlab-geo/cofi/issues/#68) Optimise special cases in linear system solver


## v0.1.2.dev9 (13/09/2022)
Expand All @@ -19,7 +28,7 @@
functions pickleable
- [#53](https://github.com/inlab-geo/cofi/issues/53) Add set_regularisation(reg, reg_matrix, lamda)
- [#57](https://github.com/inlab-geo/cofi/issues/57) Create our own exception class
- [#59](https://github.com/inlab-geo/cofi/issues/59) Optimise import cofi by not importing cofi.solvers
- [#59](https://github.com/inlab-geo/cofi/issues/59) Optimize import cofi by not importing cofi.solvers
- [#61](https://github.com/inlab-geo/cofi/issues/61) Remove lambda function from BaseProblem to avoid error in multiprocessing

### CoFI Solvers
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Run an inversion with these lines:
from cofi import InversionOptions, Inversion

inv_options = InversionOptions()
inv_options.set_solving_method("optimisation")
inv_options.set_solving_method("optimization")
inv_options.set_params(options={"maxiter":100})

inv = Inversion(inv_problem, inv_options)
Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This project is led by `InLab <http://www.inlab.edu.au/>`_.
non_linear(Non linear):::cls_parameter_estimation;
linear_system_solvers(Linear system solvers):::cls_parameter_estimation;
linear_solverlist(scipy.linalg.lstsq <br> ...):::cls_solvers;
optimisation(Optimisation):::cls_parameter_estimation;
optimization(Optimization):::cls_parameter_estimation;
opt_solverlist(scipy.minimize <br> PETSc <br> Rapid Optimization Library<br>...):::cls_solvers;
ensemble_methods(Ensemble methods):::cls_ensemble_methods;
direct_search(Direct Search):::cls_ensemble_methods;
Expand All @@ -49,8 +49,8 @@ This project is led by `InLab <http://www.inlab.edu.au/>`_.
linear --> linear_system_solvers;
linear_system_solvers -.- linear_solverlist;
parameter_estimation --> non_linear;
non_linear --> optimisation;
optimisation -.- opt_solverlist;
non_linear --> optimization;
optimization -.- opt_solverlist;

cofi --> ensemble_methods;
ensemble_methods --> direct_search;
Expand Down
4 changes: 2 additions & 2 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ components: :code:`BaseProblem`, :code:`InversionOptions`, and :code:`Inversion`

- :code:`BaseProblem` defines three things: 1) the forward problem; 2) model parameter
space (the unknowns); and 3) options specific to type of inverse problem you are
trying to solve, such as the definition of an objective function for optimisation.
trying to solve, such as the definition of an objective function for optimization.
- :code:`InversionOptions` describes details about how one wants to run the inversion, including the
inversion approach, backend tool and solver-specific parameters.
- :code:`Inversion` can be seen as an inversion engine that takes in the above two as information,
Expand All @@ -36,7 +36,7 @@ So a common workflow includes 4 steps:
`Some useful methods <api/generated/cofi.InversionOptions.html>`_ include:

- :code:`set_solving_method()` and :code:`suggest_tools()`. Once you've set a solving method (from "least squares"
and "optimisation", more will be supported), you can use :code:`suggest_tools()` to see a list of backend tools
and "optimization", more will be supported), you can use :code:`suggest_tools()` to see a list of backend tools
to choose from.

.. admonition:: Ways to suggest inversion tools
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Here are step-by-step guides that cover most of the functionalities and use case
:caption: Basic usage
:maxdepth: 1

1_basic_example_optimiser
1_basic_example_optimizer
2_basic_example_linear_lsq
3_basic_example_sampler
4_realworld_example
Expand Down
2 changes: 1 addition & 1 deletion src/cofi/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
# supported platforms, publish the packages on PyPI, create a Git tag
# pointing to the commit.

__version__ = "0.1.2.dev9"
__version__ = "0.1.2.dev10"
Loading

0 comments on commit 06106b0

Please sign in to comment.