Reverting last change

This commit is contained in:
Ricardo 2013-04-15 08:14:01 +01:00
parent 11a9e53059
commit f3ea01f76d

View file

@ -185,11 +185,12 @@ class sparse_GP(GP):
self.likelihood._set_params(p[self.Z.size+self.kern.Nparam:]) self.likelihood._set_params(p[self.Z.size+self.kern.Nparam:])
self._compute_kernel_matrices() self._compute_kernel_matrices()
if self.auto_scale_factor: if self.auto_scale_factor:
if self.likelihood.is_heteroscedastic: self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision)
self.scale_factor = max(100.,(self.psi2_beta_scaled.sum(0).max())) #if self.auto_scale_factor:
print self.scale_factor # if self.likelihood.is_heteroscedastic:
else: # self.scale_factor = max(1,np.sqrt(self.psi2_beta_scaled.sum(0).mean()))
self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision) # else:
# self.scale_factor = np.sqrt(self.psi2.sum(0).mean()*self.likelihood.precision)
self._computations() self._computations()
def _get_params(self): def _get_params(self):