From a5cf0270d37867599c2a588ddfeab0891a7eb75f Mon Sep 17 00:00:00 2001 From: Simon Kuberski Date: Wed, 8 Dec 2021 08:55:40 +0100 Subject: [PATCH] Hidden _set_cov and _set_grad, modified test for equality of covs --- pyerrors/covobs.py | 8 ++++---- pyerrors/obs.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyerrors/covobs.py b/pyerrors/covobs.py index 9343dc41..2c8f81fc 100644 --- a/pyerrors/covobs.py +++ b/pyerrors/covobs.py @@ -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)) diff --git a/pyerrors/obs.py b/pyerrors/obs.py index 934b2518..c27670ed 100644 --- a/pyerrors/obs.py +++ b/pyerrors/obs.py @@ -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