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

changes the naming of kern components

Browse source 
Kern components now only get a number if their name is duplicated
This commit is contained in:
James Hensman 2012-12-06 11:28:04 -08:00
parent f634350398
commit 9af637e214
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
GPy/kern/kern.py
View file

@ -99,6 +99,7 @@ class kern(parameterised):
newkern.constrained_fixed_values = self.constrained_fixed_values + other.constrained_fixed_values newkern.constrained_fixed_values = self.constrained_fixed_values + other.constrained_fixed_values
newkern.tied_indices = self.tied_indices + [self.Nparam + x for x in other.tied_indices] newkern.tied_indices = self.tied_indices + [self.Nparam + x for x in other.tied_indices]
return newkern return newkern
def add(self,other): def add(self,other):
""" """
Add another kernel to this one. Both kernels are defined on the same _space_ Add another kernel to this one. Both kernels are defined on the same _space_
@ -139,7 +140,13 @@ class kern(parameterised):
[p.set_param(x[s]) for p, s in zip(self.parts, self.param_slices)] [p.set_param(x[s]) for p, s in zip(self.parts, self.param_slices)]
def get_param_names(self): def get_param_names(self):
return sum([[k.name+'_'+str(i)+'_'+n for n in k.get_param_names()] for i,k in enumerate(self.parts)],[]) #this is a bit nasty: we wat to distinguish between parts with the same name by appending a count
part_names = np.array([k.name for k in self.parts],dtype=np.str)
counts = [np.sum(part_names==ni) for i, ni in enumerate(part_names)]
cum_counts = [np.sum(part_names[i:]==ni) for i, ni in enumerate(part_names)]
names = [name+'_'+str(cum_count) if count>1 else name for name,count,cum_count in zip(part_names,counts,cum_counts)]
return sum([[name+'_'+n for n in k.get_param_names()] for name,k in zip(names,self.parts)],[])
def K(self,X,X2=None,slices1=None,slices2=None): def K(self,X,X2=None,slices1=None,slices2=None):
assert X.shape[1]==self.D assert X.shape[1]==self.D