bad git merge

This commit is contained in:
James Hensman 2014-02-17 12:06:19 +00:00
parent 65a2c2a320
commit afcffcf039

View file

@ -247,7 +247,6 @@ class RBF(Kernpart):
target = np.zeros(self.input_dim) target = np.zeros(self.input_dim)
dvardLdK = self._K_dvar * dL_dK dvardLdK = self._K_dvar * dL_dK
var_len3 = self.variance / np.power(self.lengthscale, 3) var_len3 = self.variance / np.power(self.lengthscale, 3)
var_len3 = param_to_array(var_len3)
if X2 is None: if X2 is None:
# save computation for the symmetrical case # save computation for the symmetrical case
dvardLdK = dvardLdK + dvardLdK.T dvardLdK = dvardLdK + dvardLdK.T