Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
c5bddee4
Commit
c5bddee4
authored
Feb 01, 2019
by
Martin Reinecke
Browse files
Merge branch 'mr_corrections' into 'NIFTy_5'
fixes See merge request
!284
parents
1c72283b
6a3b59df
Pipeline
#43179
passed with stages
in 8 minutes and 53 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
c5bddee4
...
...
@@ -122,7 +122,7 @@ dive into NIFTy by running one of the demonstrations, e.g.:
python3 demos/getting_started_1.py
### Acknowledgement
### Acknowledgement
s
Please acknowledge the use of NIFTy in your publication(s) by using a
phrase such as the following:
...
...
@@ -133,7 +133,7 @@ phrase such as the following:
and a citation to one of the
[
publications
](
http://ift.pages.mpcdf.de/NIFTy/citations.html
)
.
###
Release Note
s
###
Licensing term
s
The NIFTy package is licensed under the terms of the
[
GPLv3
](
https://www.gnu.org/licenses/gpl.html
)
and is distributed
...
...
docs/source/code.rst
View file @
c5bddee4
...
...
@@ -402,7 +402,7 @@ Many minimizers for nonlinear problems can be characterized as
This family of algorithms is encapsulated in NIFTy's
:class:`~descent_minimizers.DescentMinimizer` class, which currently has three
concrete implementations:
:class:`~descent_minimizers.SteepestDescent`,
generally usable
concrete implementations:
:class:`~descent_minimizers.NewtonCG`, :class:`~descent_minimizers.L_BFGS` and
:class:`~descent_minimizers.VL_BFGS`. Of these algorithms, only
:class:`~descent_minimizers.NewtonCG` requires the energy object to provide
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment