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
6bbeea6f
Commit
6bbeea6f
authored
Aug 21, 2018
by
Martin Reinecke
Browse files
fixes
parent
997cdaef
Changes
4
Hide whitespace changes
Inline
Side-by-side
demos/bernoulli_demo.py
View file @
6bbeea6f
...
...
@@ -73,7 +73,7 @@ if __name__ == '__main__':
# Minimize the Hamiltonian
H
=
ift
.
Hamiltonian
(
likelihood
,
ic_sampling
)
H
=
ift
.
EnergyAdapter
(
position
,
H
)
H
=
ift
.
EnergyAdapter
(
position
,
H
,
want_metric
=
True
)
# minimizer = ift.L_BFGS(ic_newton)
H
,
convergence
=
minimizer
(
H
)
...
...
demos/getting_started_2.py
View file @
6bbeea6f
...
...
@@ -93,7 +93,7 @@ if __name__ == '__main__':
# Minimize the Hamiltonian
H
=
ift
.
Hamiltonian
(
likelihood
)
H
=
ift
.
EnergyAdapter
(
position
,
H
)
H
=
ift
.
EnergyAdapter
(
position
,
H
,
want_metric
=
True
)
H
,
convergence
=
minimizer
(
H
)
# Plot results
...
...
demos/polynomial_fit.py
View file @
6bbeea6f
...
...
@@ -87,14 +87,14 @@ N = ift.DiagonalOperator(ift.from_global_data(d_space, var))
IC
=
ift
.
GradientNormController
(
tol_abs_gradnorm
=
1e-8
)
likelihood
=
ift
.
GaussianEnergy
(
d
,
N
)(
R
)
Ham
=
ift
.
Hamiltonian
(
likelihood
,
IC
)
H
=
ift
.
EnergyAdapter
(
params
,
Ham
)
H
=
ift
.
EnergyAdapter
(
params
,
Ham
,
want_metric
=
True
)
# Minimize
minimizer
=
ift
.
NewtonCG
(
IC
)
H
,
_
=
minimizer
(
H
)
# Draw posterior samples
metric
=
Ham
(
ift
.
Linearization
.
make_var
(
H
.
position
)).
metric
metric
=
Ham
(
ift
.
Linearization
.
make_var
(
H
.
position
,
want_metric
=
True
)).
metric
samples
=
[
metric
.
draw_sample
(
from_inverse
=
True
)
+
H
.
position
for
_
in
range
(
N_samples
)]
...
...
nifty5/minimization/energy_adapter.py
View file @
6bbeea6f
...
...
@@ -12,6 +12,7 @@ class EnergyAdapter(Energy):
super
(
EnergyAdapter
,
self
).
__init__
(
position
)
self
.
_op
=
op
self
.
_constants
=
constants
self
.
_want_metric
=
want_metric
if
len
(
self
.
_constants
)
==
0
:
tmp
=
self
.
_op
(
Linearization
.
make_var
(
self
.
_position
,
want_metric
))
else
:
...
...
@@ -25,7 +26,8 @@ class EnergyAdapter(Energy):
self
.
_metric
=
tmp
.
_metric
def
at
(
self
,
position
):
return
EnergyAdapter
(
position
,
self
.
_op
,
self
.
_constants
)
return
EnergyAdapter
(
position
,
self
.
_op
,
self
.
_constants
,
self
.
_want_metric
)
@
property
def
value
(
self
):
...
...
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