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

fixed some slicing in kern.py

Browse source
This commit is contained in:
James Hensman 2012-11-30 11:21:23 +00:00
parent 411cd80cdc
commit cc98c6f507
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
GPy/kern/kern.py
View file

@ -167,7 +167,7 @@ class kern(parameterised):
if X2 is None: if X2 is None:
X2 = X X2 = X
target = np.zeros(self.Nparam) target = np.zeros(self.Nparam)
[p.dK_dtheta(partial,X[s1,i_s],X2[s2,i_s],target[ps]) for p,i_s,ps,s1,s2 in zip(self.parts, self.input_slices, self.param_slices, slices1, slices2)] [p.dK_dtheta(partial[s1,s2],X[s1,i_s],X2[s2,i_s],target[ps]) for p,i_s,ps,s1,s2 in zip(self.parts, self.input_slices, self.param_slices, slices1, slices2)]
return target return target
def dK_dX(self,partial,X,X2=None,slices1=None,slices2=None): def dK_dX(self,partial,X,X2=None,slices1=None,slices2=None):
@ -175,7 +175,7 @@ class kern(parameterised):
X2 = X X2 = X
slices1, slices2 = self._process_slices(slices1,slices2) slices1, slices2 = self._process_slices(slices1,slices2)
target = np.zeros_like(X) target = np.zeros_like(X)
[p.dK_dX(partial,X[s1],X2[s2],target[s1,:]) for p,ps,s1,s2 in zip(self.parts, self.param_slices,slices1,slices2)] [p.dK_dX(partial[s1,s2],X[s1,i_s],X2[s2,i_s],target[s1,i_s]) for p,i_s,ps,s1,s2 in zip(self.parts,self.input_slices, self.param_slices,slices1,slices2)]
return target return target
def Kdiag(self,X,slices=None): def Kdiag(self,X,slices=None):
@ -191,14 +191,14 @@ class kern(parameterised):
assert partial.size==X.shape[0] assert partial.size==X.shape[0]
slices = self._process_slices(slices,False) slices = self._process_slices(slices,False)
target = np.zeros(self.Nparam) target = np.zeros(self.Nparam)
[p.dKdiag_dtheta(partial,X[s,i_s],target[ps]) for p,i_s,s,ps in zip(self.parts,self.input_slices,slices,self.param_slices)] [p.dKdiag_dtheta(partial[s],X[s,i_s],target[ps]) for p,i_s,s,ps in zip(self.parts,self.input_slices,slices,self.param_slices)]
return target return target
def dKdiag_dX(self, X, slices=None): def dKdiag_dX(self, X, slices=None):
assert X.shape[1]==self.D assert X.shape[1]==self.D
slices = self._process_slices(slices,False) slices = self._process_slices(slices,False)
target = np.zeros((X.shape[0],X.shape[0],X.shape[1])) target = np.zeros_like(X)
[p.dKdiag_dX(X[s,i_s],target[s,:,:]) for p,i_s,s in zip(self.parts,self.input_slices,slices)] [p.dKdiag_dX(partial[s],X[s,i_s],target[s,i_s]) for p,i_s,s in zip(self.parts,self.input_slices,slices)]
return target return target
def psi0(self,Z,mu,S,slices_mu=None,slices_Z=None): def psi0(self,Z,mu,S,slices_mu=None,slices_Z=None):