Commit d88ed387 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge remote-tracking branch 'origin/remove_apply_data' into misc_work

parents 389c1190 8001f7b2
......@@ -64,7 +64,7 @@ if __name__ == '__main__':
# Minimize the Hamiltonian
H = ift.Hamiltonian(likelihood, ic_sampling)
H = H.makeInvertible(ic_cg)
H = H.make_invertible(ic_cg)
# minimizer = ift.SteepestDescent(ic_newton)
H, convergence = minimizer(H)
......
......@@ -80,7 +80,7 @@ if __name__ == '__main__':
# Minimize the Hamiltonian
H = ift.Hamiltonian(likelihood)
H = H.makeInvertible(ic_cg)
H = H.make_invertible(ic_cg)
H, convergence = minimizer(H)
# Plot results
......
......@@ -77,7 +77,7 @@ if __name__ == '__main__':
for _ in range(N_samples)]
KL = ift.SampledKullbachLeiblerDivergence(H, samples)
KL = KL.makeInvertible(ic_cg)
KL = KL.make_invertible(ic_cg)
KL, convergence = minimizer(KL)
position = KL.position
......
......@@ -76,7 +76,6 @@ from .sugar import *
from .plotting.plot import plot
from .library.amplitude_model import make_amplitude_model
from .library.apply_data import ApplyData
from .library.gaussian_energy import GaussianEnergy
from .library.los_response import LOSResponse
from .library.point_sources import PointSources
......
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright(C) 2013-2018 Max-Planck-Society
#
# NIFTy is being developed at the Max-Planck-Institut fuer Astrophysik
# and financially supported by the Studienstiftung des deutschen Volkes.
from __future__ import absolute_import, division, print_function
from ..compat import *
def ApplyData(data, var, model_data):
# TODO This is rather confusing. Delete that eventually.
from ..operators.diagonal_operator import DiagonalOperator
from ..models.constant import Constant
from ..sugar import sqrt
sqrt_n = DiagonalOperator(sqrt(var))
data = Constant(model_data.position, data)
return sqrt_n.inverse(model_data - data)
......@@ -29,6 +29,7 @@ from ..operators.domain_distributor import DomainDistributor
from ..operators.harmonic_transform_operator \
import HarmonicTransformOperator
def make_correlated_field(s_space, amplitude_model):
'''
Method for construction of correlated fields
......@@ -84,7 +85,8 @@ def make_mf_correlated_field(s_space_spatial, s_space_energy,
a = a_spatial*a_energy
A = pd(a)
position = MultiField.from_dict({'xi': Field.from_random('normal', h_space)})
position = MultiField.from_dict(
{'xi': Field.from_random('normal', h_space)})
xi = Variable(position)['xi']
correlated_field_h = A*xi
correlated_field = ht(correlated_field_h)
......
......@@ -130,7 +130,7 @@ class Energy(NiftyMetaBase()):
"""
return None
def makeInvertible(self, controller, preconditioner=None):
def make_invertible(self, controller, preconditioner=None):
from .iteration_controller import IterationController
if not isinstance(controller, IterationController):
raise TypeError
......
......@@ -132,8 +132,8 @@ class MultiField(object):
@staticmethod
def from_global_data(domain, arr, sum_up=False):
return MultiField(domain, tuple(Field.from_global_data(domain[key],
arr[key], sum_up)
return MultiField(
domain, tuple(Field.from_global_data(domain[key], arr[key], sum_up)
for key in domain.keys()))
def norm(self):
......
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