lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-03-15 14:50:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Hidden _set_cov and _set_grad, modified test for equality of covs

Browse source
This commit is contained in:
Simon Kuberski 2021-12-08 08:55:40 +01:00
parent 7c5465d828
commit a5cf0270d3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pyerrors/covobs.py
View file

@ -20,7 +20,7 @@ class Covobs:
grad : list or array
Gradient of the Covobs wrt. the means belonging to cov.
"""
self.set_cov(cov)
self._set_cov(cov)
if '|' in name:
raise Exception("Covobs name must not contain replica separator '|'.")
self.name = name
@ -36,7 +36,7 @@ class Covobs:
self._grad = np.zeros((self.N, 1))
self._grad[pos] = 1.
else:
self.set_grad(grad)
self._set_grad(grad)
self.value = mean
def errsq(self):
@ -44,7 +44,7 @@ class Covobs:
"""
return float(np.dot(np.transpose(self.grad), np.dot(self.cov, self.grad)))
def set_cov(self, cov):
def _set_cov(self, cov):
self._cov = np.array(cov)
if self._cov.ndim == 0:
self.N = 1
@ -59,7 +59,7 @@ class Covobs:
else:
raise Exception('Covariance matrix has to be a 2 dimensional square matrix!')
def set_grad(self, grad):
def _set_grad(self, grad):
self._grad = np.array(grad)
if self._grad.ndim in [0, 1]:
self._grad = np.reshape(self._grad, (self.N, 1))

2
pyerrors/obs.py
View file

@ -1069,7 +1069,7 @@ def derived_observable(func, data, array_mode=False, **kwargs):
for o in raveled_data:
for name in o.cov_names:
if name in allcov:
if not np.allclose(allcov[name], o.covobs[name].cov, rtol=1e-14, atol=1e-14):
if not np.allclose(allcov[name], o.covobs[name].cov):
raise Exception('Inconsistent covariance matrices for %s!' % (name))
else:
allcov[name] = o.covobs[name].cov