From f3ea01f76dcca8ecd11954eb545ecba471a11918 Mon Sep 17 00:00:00 2001 From: Ricardo Date: Mon, 15 Apr 2013 08:14:01 +0100 Subject: [PATCH] Reverting last change --- GPy/models/sparse_GP.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/GPy/models/sparse_GP.py b/GPy/models/sparse_GP.py index b816e684..7da36835 100644 --- a/GPy/models/sparse_GP.py +++ b/GPy/models/sparse_GP.py @@ -185,11 +185,12 @@ class sparse_GP(GP): self.likelihood._set_params(p[self.Z.size+self.kern.Nparam:]) self._compute_kernel_matrices() if self.auto_scale_factor: - if self.likelihood.is_heteroscedastic: - self.scale_factor = max(100.,(self.psi2_beta_scaled.sum(0).max())) - print self.scale_factor - else: - self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision) + self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision) + #if self.auto_scale_factor: + # if self.likelihood.is_heteroscedastic: + # self.scale_factor = max(1,np.sqrt(self.psi2_beta_scaled.sum(0).mean())) + # else: + # self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision) self._computations() def _get_params(self):