Commit 22cf99a8 authored by Philipp Arras's avatar Philipp Arras

Move Hamiltonian to energies

parent ed1c00ff
from .kl import SampledKullbachLeiblerDivergence
from .hamiltonian import Hamiltonian
......@@ -2,7 +2,7 @@ from ..minimization.energy import Energy
from ..operators import InversionEnabler, SamplingEnabler
from ..models.variable import Variable
from ..utilities import memo
from .unit_log_gauss import UnitLogGauss
from ..library.unit_log_gauss import UnitLogGauss
class Hamiltonian(Energy):
......
......@@ -8,4 +8,3 @@ from .poisson_log_likelihood import PoissonLogLikelihood
from .smooth_sky import make_smooth_mf_sky_model, make_smooth_sky_model
from .wiener_filter_curvature import WienerFilterCurvature
from .wiener_filter_energy import WienerFilterEnergy
from .hamiltonian import Hamiltonian
......@@ -18,7 +18,7 @@
from ..models.constant import Constant
from .unit_log_gauss import UnitLogGauss
from .hamiltonian import Hamiltonian
from ..energies.hamiltonian import Hamiltonian
def NonlinearWienerFilterEnergy(measured_data, data_model, sqrtN, iteration_controller):
......@@ -26,4 +26,3 @@ def NonlinearWienerFilterEnergy(measured_data, data_model, sqrtN, iteration_cont
residual = Constant(data_model.position, d) - data_model
lh = UnitLogGauss(sqrtN.inverse(residual))
return Hamiltonian(lh, iteration_controller)
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