diff --git a/test/test_field.py b/test/test_field.py index 5c9c0da77c5615bf3bf1cb9c413f1e724493af49..1394cbee46e6706481ffe2e267197574b1313e3e 100644 --- a/test/test_field.py +++ b/test/test_field.py @@ -20,6 +20,7 @@ import pytest from numpy.testing import assert_allclose, assert_equal, assert_raises import nifty6 as ift + from .common import setup_function, teardown_function pmp = pytest.mark.parametrize @@ -46,31 +47,26 @@ def _spec2(k): return 42/(1. + k)**3 -@pmp('space1', [ - ift.RGSpace((8,), harmonic=True), - ift.RGSpace((8, 8), harmonic=True, distances=0.123) -]) +@pmp('space1', [ift.RGSpace((8,), harmonic=True), + ift.RGSpace((8, 8), harmonic=True, distances=0.123)]) @pmp('space2', [ift.RGSpace((8,), harmonic=True), ift.LMSpace(12)]) def test_power_synthesize_analyze(space1, space2): p1 = ift.PowerSpace(space1) fp1 = ift.PS_field(p1, _spec1) p2 = ift.PowerSpace(space2) fp2 = ift.PS_field(p2, _spec2) - op1 = ift.create_power_operator((space1, space2), _spec1, 0) op2 = ift.create_power_operator((space1, space2), _spec2, 1) - opfull = op2(op1) + opfull = op2 @ op1 - samples = 500 + samples = 120 sc1 = ift.StatCalculator() sc2 = ift.StatCalculator() for ii in range(samples): sk = opfull.draw_sample_with_dtype(dtype=np.float64) - sp = ift.power_analyze(sk, spaces=(0, 1), keep_phase_information=False) sc1.add(sp.sum(spaces=1)/fp2.s_sum()) sc2.add(sp.sum(spaces=0)/fp1.s_sum()) - assert_allclose(sc1.mean.val, fp1.val, rtol=0.2) assert_allclose(sc2.mean.val, fp2.val, rtol=0.2) diff --git a/test/test_operators/test_correlated_fields.py b/test/test_operators/test_correlated_fields.py index b8fb2315f5b4e7607a0fa46d6320662523f5a054..f9985133770b2840d9d5f9b3d21f02711c8c218e 100644 --- a/test/test_operators/test_correlated_fields.py +++ b/test/test_operators/test_correlated_fields.py @@ -24,12 +24,14 @@ from ..common import setup_function, teardown_function pmp = pytest.mark.parametrize + def _stats(op, samples): sc = ift.StatCalculator() for s in samples: sc.add(op(s.extract(op.domain))) return sc.mean.val, sc.var.ptw("sqrt").val + @pmp('sspace', [ift.RGSpace(4), ift.RGSpace((4, 4), (0.123, 0.4)), ift.HPSpace(8), ift.GLSpace(4)]) @pmp('N', [0, 2])