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
3150ff53
Commit
3150ff53
authored
May 11, 2017
by
Theo Steininger
Browse files
Bug fixes.
parent
95df1f22
Pipeline
#12269
passed with stage
in 5 minutes and 44 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
nifty/minimization/__init__.py
View file @
3150ff53
...
...
@@ -18,7 +18,7 @@
from
line_searching
import
*
from
conjugate_gradient
import
ConjugateGradient
from
descent_minimizer
import
QuasiNewton
Minimizer
from
descent_minimizer
import
Descent
Minimizer
from
steepest_descent
import
SteepestDescent
from
vl_bfgs
import
VL_BFGS
from
relaxed_newton
import
RelaxedNewton
nifty/minimization/line_searching/line_search_strong_wolfe.py
View file @
3150ff53
...
...
@@ -148,8 +148,8 @@ class LineSearchStrongWolfe(LineSearch):
# extract the full energy from the line_energy
energy_star
=
energy_star
.
energy
length_
direction
=
pk
.
norm
step_length
=
alpha_star
*
length_
direction
direction
_length
=
pk
.
norm
()
step_length
=
alpha_star
*
direction
_length
return
step_length
,
phi_star
,
energy_star
def
_zoom
(
self
,
alpha_lo
,
alpha_hi
,
phi_0
,
phiprime_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