Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ift
NIFTy
Commits
2158e485
Commit
2158e485
authored
Aug 30, 2017
by
Theo Steininger
Browse files
Fixed bug in line_search_strong_wolfe.py
parent
f64657e5
Pipeline
#17539
passed with stages
in 33 minutes and 46 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nifty/minimization/conjugate_gradient.py
View file @
2158e485
...
...
@@ -158,7 +158,7 @@ class ConjugateGradient(Loggable, object):
if
self
.
reset_count
is
not
None
:
reset
+=
(
iteration_number
%
self
.
reset_count
==
0
)
if
reset
:
self
.
logger
.
info
(
"
Resetting conjugate directions
."
)
self
.
logger
.
info
(
"
Computing accurate residuum
."
)
r
=
b
-
A
(
x
)
else
:
r
-=
q
*
alpha
...
...
nifty/minimization/line_searching/line_search_strong_wolfe.py
View file @
2158e485
...
...
@@ -139,7 +139,7 @@ class LineSearchStrongWolfe(LineSearch):
phi_alpha1
=
le_alpha1
.
value
if
(
phi_alpha1
>
phi_0
+
self
.
c1
*
alpha1
*
phiprime_0
)
or
\
((
phi_alpha1
>=
phi_alpha0
)
and
(
i
>
0
)):
((
phi_alpha1
>=
phi_alpha0
)
and
(
i
teration_number
>
0
)):
le_star
=
self
.
_zoom
(
alpha0
,
alpha1
,
phi_0
,
phiprime_0
,
phi_alpha0
,
phiprime_alpha0
,
phi_alpha1
,
le_0
)
...
...
Write
Preview
Markdown
is supported
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