From 37e802de8defb34749a90a0601187acd90699f74 Mon Sep 17 00:00:00 2001 From: Martin Reinecke <martin@mpa-garching.mpg.de> Date: Fri, 23 Mar 2018 16:18:53 +0100 Subject: [PATCH] temporary renaming to make things less confusing --- nifty4/library/nonlinear_power_energy.py | 2 +- nifty4/library/wiener_filter_curvature.py | 2 +- nifty4/probing/utils.py | 2 +- test/test_energies/test_noise.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nifty4/library/nonlinear_power_energy.py b/nifty4/library/nonlinear_power_energy.py index 50f4a9d0c..8ba6c0339 100644 --- a/nifty4/library/nonlinear_power_energy.py +++ b/nifty4/library/nonlinear_power_energy.py @@ -70,7 +70,7 @@ class NonlinearPowerEnergy(Energy): if samples is None or samples == 0: xi_sample_list = [xi] else: - xi_sample_list = [D.draw_sample() + xi + xi_sample_list = [D.draw_inverse_sample() + xi for _ in range(samples)] self.xi_sample_list = xi_sample_list self.inverter = inverter diff --git a/nifty4/library/wiener_filter_curvature.py b/nifty4/library/wiener_filter_curvature.py index 08e075bab..2373905bc 100644 --- a/nifty4/library/wiener_filter_curvature.py +++ b/nifty4/library/wiener_filter_curvature.py @@ -60,7 +60,7 @@ class WienerFilterCurvature(EndomorphicOperator): def apply(self, x, mode): return self._op.apply(x, mode) - def draw_sample(self, dtype=np.float64): + def draw_inverse_sample(self, dtype=np.float64): n = self.N.draw_sample(dtype) s = self.S.draw_sample(dtype) diff --git a/nifty4/probing/utils.py b/nifty4/probing/utils.py index c36b5f070..e11b2bd7c 100644 --- a/nifty4/probing/utils.py +++ b/nifty4/probing/utils.py @@ -51,7 +51,7 @@ class StatCalculator(object): def probe_with_posterior_samples(op, post_op, nprobes): sc = StatCalculator() for i in range(nprobes): - sample = post_op(op.draw_sample()) + sample = post_op(op.draw_inverse_sample()) sc.add(sample) if nprobes == 1: diff --git a/test/test_energies/test_noise.py b/test/test_energies/test_noise.py index 143d0b62c..f6ddf1874 100644 --- a/test/test_energies/test_noise.py +++ b/test/test_energies/test_noise.py @@ -84,7 +84,7 @@ class Noise_Energy_Tests(unittest.TestCase): S=S, inverter=inverter).curvature - res_sample_list = [d - R(f(ht(C.draw_sample() + xi))) + res_sample_list = [d - R(f(ht(C.draw_inverse_sample() + xi))) for _ in range(10)] energy0 = ift.library.NoiseEnergy(eta0, alpha, q, res_sample_list) -- GitLab