From 8ad774cb4e8e78b7fbe167af7fdaa85f45511250 Mon Sep 17 00:00:00 2001 From: Siivola Eero Date: Tue, 4 Jul 2017 13:18:06 +0300 Subject: [PATCH] Fixed two small lbugs --- .../latent_function_inference/expectation_propagation.py | 2 +- GPy/likelihoods/gaussian.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GPy/inference/latent_function_inference/expectation_propagation.py b/GPy/inference/latent_function_inference/expectation_propagation.py index 80d38c04..81c020df 100644 --- a/GPy/inference/latent_function_inference/expectation_propagation.py +++ b/GPy/inference/latent_function_inference/expectation_propagation.py @@ -175,7 +175,7 @@ class EP(EPBase, ExactGaussianInference): if self.ep_mode=="nested": #Force EP at each step of the optimization self._ep_approximation = None - post_params, ga_approx, log_Z_tilde = self._ep_approximation = self.expectation_propagation(K, Y, likelihood, Y_metadata) + post_params, ga_approx, cav_params, log_Z_tilde = self._ep_approximation = self.expectation_propagation(K, Y, likelihood, Y_metadata) elif self.ep_mode=="alternated": if getattr(self, '_ep_approximation', None) is None: #if we don't yet have the results of runnign EP, run EP and store the computed factors in self._ep_approximation diff --git a/GPy/likelihoods/gaussian.py b/GPy/likelihoods/gaussian.py index a798ddfd..4db46918 100644 --- a/GPy/likelihoods/gaussian.py +++ b/GPy/likelihoods/gaussian.py @@ -60,7 +60,7 @@ class Gaussian(Likelihood): def ep_gradients(self, Y, cav_tau, cav_v, dL_dKdiag,Y_metadata=None): return self.exact_inference_gradients(dL_dKdiag) - def exact_inference_gradients(self, dL_dKdiag): + def exact_inference_gradients(self, dL_dKdiag, Y_metadata=None): return dL_dKdiag.sum() def _preprocess_values(self, Y):