lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-15 20:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into documentation

Browse source
This commit is contained in:
fjosw 2022-03-31 10:46:09 +00:00
commit 29f1757c7e
5 changed files with 45 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pyerrors/input/json.py
View file

@ -358,7 +358,7 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
ret = Obs([[ddi[0] + values[0] for ddi in di] for di in od['deltas']], od['names'], idl=od['idl']) ret = Obs([[ddi[0] + values[0] for ddi in di] for di in od['deltas']], od['names'], idl=od['idl'])
ret.is_merged = od['is_merged'] ret.is_merged = od['is_merged']
else: else:
ret = Obs([], []) ret = Obs([], [], means=[])
ret._value = values[0] ret._value = values[0]
for name in cd: for name in cd:
co = cd[name][0] co = cd[name][0]
@ -383,7 +383,7 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
ret.append(Obs([list(di[:, i] + values[i]) for di in od['deltas']], od['names'], idl=od['idl'])) ret.append(Obs([list(di[:, i] + values[i]) for di in od['deltas']], od['names'], idl=od['idl']))
ret[-1].is_merged = od['is_merged'] ret[-1].is_merged = od['is_merged']
else: else:
ret.append(Obs([], [])) ret.append(Obs([], [], means=[]))
ret[-1]._value = values[i] ret[-1]._value = values[i]
print('Created Obs with means= ', values[i]) print('Created Obs with means= ', values[i])
for name in cd: for name in cd:
@ -410,7 +410,7 @@ def _parse_json_dict(json_dict, verbose=True, full_output=False):
ret.append(Obs([di[:, i] + values[i] for di in od['deltas']], od['names'], idl=od['idl'])) ret.append(Obs([di[:, i] + values[i] for di in od['deltas']], od['names'], idl=od['idl']))
ret[-1].is_merged = od['is_merged'] ret[-1].is_merged = od['is_merged']
else: else:
ret.append(Obs([], [])) ret.append(Obs([], [], means=[]))
ret[-1]._value = values[i] ret[-1]._value = values[i]
for name in cd: for name in cd:
co = cd[name][i] co = cd[name][i]

18
pyerrors/obs.py
View file

@ -90,8 +90,10 @@ class Obs:
self.deltas = {} self.deltas = {}
self._covobs = {} self._covobs = {}
self._value = 0
self.N = 0
self.is_merged = {}
self.idl = {} self.idl = {}
if len(samples):
if idl is not None: if idl is not None:
for name, idx in sorted(zip(names, idl)): for name, idx in sorted(zip(names, idl)):
if isinstance(idx, range): if isinstance(idx, range):
@ -110,8 +112,6 @@ class Obs:
for name, sample in sorted(zip(names, samples)): for name, sample in sorted(zip(names, samples)):
self.idl[name] = range(1, len(sample) + 1) self.idl[name] = range(1, len(sample) + 1)
self._value = 0
self.N = 0
if kwargs.get("means") is not None: if kwargs.get("means") is not None:
for name, sample, mean in sorted(zip(names, samples, kwargs.get("means"))): for name, sample, mean in sorted(zip(names, samples, kwargs.get("means"))):
self.shape[name] = len(self.idl[name]) self.shape[name] = len(self.idl[name])
@ -129,13 +129,6 @@ class Obs:
self._value += self.shape[name] * self.r_values[name] self._value += self.shape[name] * self.r_values[name]
self._value /= self.N self._value /= self.N
self.is_merged = {}
else:
self._value = 0
self.is_merged = {}
self.N = 0
self._dvalue = 0.0 self._dvalue = 0.0
self.ddvalue = 0.0 self.ddvalue = 0.0
self.reweighted = False self.reweighted = False
@ -1490,7 +1483,8 @@ def import_jackknife(jacks, name, idl=None):
length = len(jacks) - 1 length = len(jacks) - 1
prj = (np.ones((length, length)) - (length - 1) * np.identity(length)) prj = (np.ones((length, length)) - (length - 1) * np.identity(length))
samples = jacks[1:] @ prj samples = jacks[1:] @ prj
new_obs = Obs([samples], [name], idl=idl) mean = np.mean(samples)
new_obs = Obs([samples - mean], [name], idl=idl, means=[mean])
new_obs._value = jacks[0] new_obs._value = jacks[0]
return new_obs return new_obs
@ -1549,7 +1543,7 @@ def cov_Obs(means, cov, name, grad=None):
co : Covobs co : Covobs
Covobs to be embedded into the Obs Covobs to be embedded into the Obs
""" """
o = Obs([], []) o = Obs([], [], means=[])
o._value = co.value o._value = co.value
o.names.append(co.name) o.names.append(co.name)
o._covobs[co.name] = co o._covobs[co.name] = co

2
pyerrors/version.py
View file

@ -1 +1 @@
__version__ = "2.0.0" __version__ = "2.1.0+dev"

2
setup.py
View file

@ -3,7 +3,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
setup(name='pyerrors', setup(name='pyerrors',
version='2.0.0', version='2.1.0+dev',
description='Error analysis for lattice QCD', description='Error analysis for lattice QCD',
author='Fabian Joswig', author='Fabian Joswig',
author_email='fabian.joswig@ed.ac.uk', author_email='fabian.joswig@ed.ac.uk',

4
tests/obs_test.py
View file

@ -716,7 +716,7 @@ def test_covariance_rank_deficient():
def test_empty_obs(): def test_empty_obs():
o = pe.Obs([np.random.rand(100)], ['test']) o = pe.Obs([np.random.rand(100)], ['test'])
q = o + pe.Obs([], []) q = o + pe.Obs([], [], means=[])
assert q == o assert q == o
@ -769,6 +769,7 @@ def test_merge_idx():
for i in range(1, len(new_idx)): for i in range(1, len(new_idx)):
assert(new_idx[i - 1] < new_idx[i]) assert(new_idx[i - 1] < new_idx[i])
def test_cobs_array(): def test_cobs_array():
cobs = pe.Obs([np.random.normal(1.0, 0.1, 100)], ['t']) * (1 + 2j) cobs = pe.Obs([np.random.normal(1.0, 0.1, 100)], ['t']) * (1 + 2j)
np.identity(4) + cobs np.identity(4) + cobs
@ -779,4 +780,3 @@ def test_cobs_array():
cobs * np.identity(4) cobs * np.identity(4)
np.identity(4) / cobs np.identity(4) / cobs
cobs / np.ones((4, 4)) cobs / np.ones((4, 4))