Skip to content
GitLab
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
4abc57ca
Commit
4abc57ca
authored
Jul 29, 2019
by
Philipp Arras
Browse files
Add possibility to control number of steps before reset in NewtonCG
parent
5a94873d
Pipeline
#52652
failed with stages
in 5 minutes and 29 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty5/minimization/descent_minimizers.py
View file @
4abc57ca
...
...
@@ -160,13 +160,15 @@ class NewtonCG(DescentMinimizer):
Algorithm derived from SciPy sources.
"""
def
__init__
(
self
,
controller
,
napprox
=
0
,
line_searcher
=
None
,
name
=
None
):
def
__init__
(
self
,
controller
,
napprox
=
0
,
line_searcher
=
None
,
name
=
None
,
nreset
=
20
):
if
line_searcher
is
None
:
line_searcher
=
LineSearch
(
preferred_initial_step_size
=
1.
)
super
(
NewtonCG
,
self
).
__init__
(
controller
=
controller
,
line_searcher
=
line_searcher
)
self
.
_napprox
=
napprox
self
.
_name
=
name
self
.
_nreset
=
nreset
def
get_descent_direction
(
self
,
energy
,
f_k_minus_1
):
if
f_k_minus_1
is
None
:
...
...
@@ -182,7 +184,8 @@ class NewtonCG(DescentMinimizer):
unscmet
,
sc
=
energy
.
unscaled_metric
()
approx
=
makeOp
(
approximation2endo
(
unscmet
,
self
.
_napprox
)
*
sc
)
p
=
approx
.
inverse
e
,
conv
=
ConjugateGradient
(
ic
,
nreset
=
np
.
inf
)(
e
,
preconditioner
=
p
)
e
,
conv
=
ConjugateGradient
(
ic
,
nreset
=
self
.
_nreset
)(
e
,
preconditioner
=
p
)
if
conv
==
ic
.
ERROR
:
raise
RuntimeError
return
-
e
.
position
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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