Merge branch 'devel' of github.com:/sheffieldml/GPy into mean_functions

This commit is contained in:
James Hensman 2015-03-25 16:48:24 +00:00
commit 254157ce04
6 changed files with 50 additions and 6 deletions

View file

@ -41,8 +41,11 @@ class EP(LatentFunctionInference):
K = kern.K(X)
if self._ep_approximation is None:
#if we don't yet have the results of runnign EP, run EP and store the computed factors in self._ep_approximation
mu, Sigma, mu_tilde, tau_tilde, Z_hat = self._ep_approximation = self.expectation_propagation(K, Y, likelihood, Y_metadata)
else:
#if we've already run EP, just use the existing approximation stored in self._ep_approximation
mu, Sigma, mu_tilde, tau_tilde, Z_hat = self._ep_approximation
Wi, LW, LWi, W_logdet = pdinv(K + np.diag(1./tau_tilde))