Commit 2e63dd00 authored by Martin Reinecke's avatar Martin Reinecke

Merge branch 'AbsDeltaEnergyController2' into 'NIFTy_5'

Uses AbsDeltaEnergyController in Demo3

See merge request !351
parents f66235b7 e51b21b8
Pipeline #61791 passed with stages
in 20 minutes and 5 seconds
...@@ -103,9 +103,10 @@ if __name__ == '__main__': ...@@ -103,9 +103,10 @@ if __name__ == '__main__':
data = signal_response(mock_position) + N.draw_sample() data = signal_response(mock_position) + N.draw_sample()
# Minimization parameters # Minimization parameters
ic_sampling = ift.GradientNormController(iteration_limit=100) ic_sampling = ift.AbsDeltaEnergyController(
ic_newton = ift.GradInfNormController( name='Sampling', deltaE=0.05, iteration_limit=100)
name='Newton', tol=1e-7, iteration_limit=35) ic_newton = ift.AbsDeltaEnergyController(
name='Newton', deltaE=0.5, iteration_limit=35)
minimizer = ift.NewtonCG(ic_newton) minimizer = ift.NewtonCG(ic_newton)
# Set up likelihood and information Hamiltonian # Set up likelihood and information Hamiltonian
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment