Merge branch 'develop' into documentation

This commit is contained in:
fjosw 2022-10-19 14:33:54 +00:00
commit f71e69e36e
3 changed files with 67 additions and 4 deletions

View file

@ -90,14 +90,38 @@ def test_deriv():
assert np.all([o == 0 for o in (corr.deriv('forward').deriv('backward') - corr.second_deriv())[1:-1]])
assert np.all([o == 0 for o in (corr.deriv('backward').deriv('forward') - corr.second_deriv())[1:-1]])
corr_content = []
exponent = -0.05
for t in range(24):
corr_content.append(pe.pseudo_Obs(np.exp(t * exponent), np.exp(t * exponent) * 0.02, 't'))
corr = pe.Corr(corr_content)
for o in [(corr.deriv('log') / corr / exponent - 1)[10], (corr.second_deriv('log') / corr / exponent**2 - 1)[12]]:
o.gamma_method()
assert (o.is_zero_within_error() and np.isclose(0.0, o.value, 1e-12, 1e-12))
def test_m_eff():
for padding in [0, 4]:
my_corr = pe.correlators.Corr([pe.pseudo_Obs(10, 0.1, 't'), pe.pseudo_Obs(9, 0.05, 't'), pe.pseudo_Obs(9, 0.1, 't'), pe.pseudo_Obs(10, 0.05, 't')], padding=[padding, padding])
my_corr.m_eff('log')
my_corr.m_eff('logsym')
my_corr.m_eff('cosh')
my_corr.m_eff('arccosh')
corr_content = []
exponent = -2.2
for t in range(24):
corr_content.append(pe.pseudo_Obs(np.exp(t * exponent), np.exp(t * exponent) * 0.02, 't'))
corr = pe.Corr(corr_content)
for variant in ['log', 'logsym']:
o = (corr.m_eff(variant) / exponent + 1)[7]
o.gamma_method()
assert (o.is_zero_within_error() and np.isclose(0.0, o.value, 1e-12, 1e-12))
with pytest.warns(RuntimeWarning):
my_corr.m_eff('sinh')
@ -112,6 +136,8 @@ def test_m_eff_negative_values():
assert m_eff_log[padding + 1] is None
m_eff_cosh = my_corr.m_eff('cosh')
assert m_eff_cosh[padding + 1] is None
with pytest.raises(Exception):
my_corr.m_eff('logsym')
def test_reweighting():

View file

@ -235,8 +235,8 @@ def test_fit_corr_independent():
assert np.isclose(out.chisquare, out_corr.chisquare)
assert np.isclose(out.dof, out_corr.dof)
assert np.isclose(out.chisquare_by_dof, out_corr.chisquare_by_dof)
assert (out[0] - out_corr[0]).is_zero(atol=1e-5)
assert (out[1] - out_corr[1]).is_zero(atol=1e-5)
assert (out[0] - out_corr[0]).is_zero(atol=1e-4)
assert (out[1] - out_corr[1]).is_zero(atol=1e-4)
def test_linear_fit_guesses():