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

Conflicts:
	GPy/models/GP.py
This commit is contained in:
Ricardo 2013-05-22 12:15:00 +01:00
commit 171a25d46d
4 changed files with 67 additions and 42 deletions

View file

@ -234,7 +234,7 @@ class sparse_GP(GP):
Kxx = self.kern.Kdiag(Xnew, which_parts=which_parts)
var = Kxx - np.sum(Kx * np.dot(Kmmi_LmiBLmi, Kx), 0)
else:
assert which_parts=='all', "swithching out parts of variational kernels is not implemented"
# assert which_parts=='all', "swithching out parts of variational kernels is not implemented"
Kx = self.kern.psi1(self.Z, Xnew, X_variance_new)#, which_parts=which_parts) TODO: which_parts
mu = np.dot(Kx, self.Cpsi1V)
if full_cov: