apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-15 06:52:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
James Hensman 2013-11-12 14:45:32 +00:00
commit e1e030e72b
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/kern/kern.py
View file

@ -462,14 +462,10 @@ class kern(Parameterized):
pass pass
# rbf X bias # rbf X bias
elif isinstance(p1, (Bias, Fixed)) and isinstance(p2, (RBF, RBFInv)): elif isinstance(p1, (Bias, Fixed)) and isinstance(p2, (RBF, RBFInv)):
target += p1.variance * (p2._psi1[:, :, None] + p2._psi1[:, None, :]) target += 2 * p1.variance * (p2._psi1[:, :, None] + p2._psi1[:, None, :])
elif isinstance(p2, (Bias, Fixed)) and isinstance(p1, (RBF, RBFInv)): elif isinstance(p2, (Bias, Fixed)) and isinstance(p1, (RBF, RBFInv)):
import ipdb;ipdb.set_trace()
tmp1 = p2.variance * (p1._psi1[:, :, None] + p1._psi1[:, None, :]) tmp1 = p2.variance * (p1._psi1[:, :, None] + p1._psi1[:, None, :])
renorm = p1.variance*np.exp() renorm = p1.variance*np.exp()
tmp2 = asd
target += p2.variance * (p1._psi1[:, :, None] + p1._psi1[:, None, :]) target += p2.variance * (p1._psi1[:, :, None] + p1._psi1[:, None, :])
# linear X bias # linear X bias
elif isinstance(p1, (Bias, Fixed)) and isinstance(p2, Linear): elif isinstance(p1, (Bias, Fixed)) and isinstance(p2, Linear):