From 219a90823ad71558807a957392e5af470c2193c1 Mon Sep 17 00:00:00 2001 From: Theo Steininger Date: Thu, 14 Dec 2017 04:23:41 +0100 Subject: [PATCH] moved n --- .../likelihoods/ensemble_likelihood/ensemble_likelihood.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py b/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py index 3171e28..9690c90 100644 --- a/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py +++ b/imagine/likelihoods/ensemble_likelihood/ensemble_likelihood.py @@ -98,6 +98,9 @@ class EnsembleLikelihood(Likelihood): result_1 = np.vdot(c, first_summand_val) result_2 = -np.vdot(c, second_summand_val) + result_1 /= n + result_2 /= n + # compute regularizing determinant of the covariance # det(A + UV^T) = det(A) det(I + V^T A^-1 U) log_det_1 = np.sum(np.log(B)) @@ -105,7 +108,7 @@ class EnsembleLikelihood(Likelihood): if sign < 0: self.logger.error("Negative determinant of covariance!") - result = -0.5*((result_1 + result_2)/n + log_det_1 + log_det_2) + result = -0.5*(result_1 + result_2 + log_det_1 + log_det_2) self.logger.info("Calculated (%s): -(%g + %g + %g + %g) = %g" % (self.observable_name, -- GitLab