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

kern conflict

Browse source
This commit is contained in:
Max Zwiessele 2013-04-23 16:37:13 +01:00
parent 264f0d21b6
commit 2b3b7350cd
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
GPy/kern/kern.py
View file

@ -440,7 +440,11 @@ class kern(parameterised):
# TODO: better looping
for i1, i2 in itertools.combinations(range(len(self.parts)), 2):
p1, p2 = self.parts[i1], self.parts[i2]
<<<<<<< Updated upstream
# ipsl1, ipsl2 = self.input_slices[i1], self.input_slices[i2]
=======
ipsl1, ipsl2 = self.input_slices[i1], self.input_slices[i2]
>>>>>>> Stashed changes
ps1, ps2 = self.param_slices[i1], self.param_slices[i2]
# white doesn;t combine with anything
@ -455,6 +459,7 @@ class kern(parameterised):
p2.dpsi1_dtheta(dL_dpsi2.sum(1) * p1._psi1 * 2., Z, mu, S, target[ps2])
# linear X bias
elif p1.name == 'bias' and p2.name == 'linear':
<<<<<<< Updated upstream
p2.dpsi1_dtheta(dL_dpsi2.sum(1) * p1.variance * 2., Z, mu, S, target[ps2]) # [ps1])
psi1 = np.zeros((mu.shape[0], Z.shape[0]))
p2.psi1(Z, mu, S, psi1)
@ -464,6 +469,11 @@ class kern(parameterised):
psi1 = np.zeros((mu.shape[0], Z.shape[0]))
p1.psi1(Z, mu, S, psi1)
p2.dpsi1_dtheta(dL_dpsi2.sum(1) * psi1 * 2., Z, mu, S, target[ps2])
=======
p2.dpsi1_dtheta(dL_dpsi2.sum(1) * p1.variance * 2., Z, mu, S, target[ps1])
elif p2.name == 'bias' and p1.name == 'linear':
p1.dpsi1_dtheta(dL_dpsi2.sum(1) * p2.variance * 2., Z, mu, S, target[ps1])
>>>>>>> Stashed changes
# rbf X linear
elif p1.name == 'linear' and p2.name == 'rbf':
raise NotImplementedError # TODO