Commit 496b9d07 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

merge master and more features

parents 508800eb 846cc966
# -*- coding: utf-8 -*-
from nifty.spaces import RGSpace
from nifty.plotting.figures import Figure2D
from nifty.plotting.plots import Heatmap
from ...spaces import RGSpace
from ..figures import Figure2D
from ..plots import Heatmap
from .plotter_base import PlotterBase
......
......@@ -21,10 +21,9 @@ from builtins import range
from builtins import object
import numpy as np
from nifty.field import Field
import nifty.nifty_utilities as utilities
from nifty import nifty_configuration as nc
from ...field import Field
from ... import nifty_utilities as utilities
from ... import nifty_configuration as nc
from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES
......
......@@ -108,7 +108,7 @@ def generate_posterior_sample(mean, covariance):
R = covariance.R
N = covariance.N
power = S.diagonal().power_analyze()**.5
power = sqrt(S.diagonal().power_analyze())
mock_signal = power.power_synthesize(real_signal=True)
noise = N.diagonal(bare=True)
......
......@@ -24,7 +24,7 @@ class Test_Minimizers(unittest.TestCase):
covariance = ift.DiagonalOperator(space, diagonal=covariance_diagonal)
required_result = ift.Field(space, val=1.)
IC = ift.DefaultIterationController(tol_gradnorm=1e-5)
IC = ift.DefaultIterationController(tol_abs_gradnorm=1e-5,verbose=True, name="blahh")
minimizer = minimizer_class(controller=IC)
energy = ift.QuadraticEnergy(A=covariance, b=required_result,
position=starting_point)
......
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