apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-04-29 14:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed product kern get and set state

Browse source
This commit is contained in:
James Hensman 2013-11-11 09:26:22 +00:00
parent f4ecb47464
commit d7a4e34b3d
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GPy/kern/parts/prod.py
View file

@ -19,7 +19,10 @@ class Prod(Kernpart):
""" """
def __init__(self,k1,k2,tensor=False): def __init__(self,k1,k2,tensor=False):
self.num_params = k1.num_params + k2.num_params self.num_params = k1.num_params + k2.num_params
if tensor:
self.name = '['+k1.name + '**' + k2.name +']' self.name = '['+k1.name + '**' + k2.name +']'
else:
self.name = '['+k1.name + '*' + k2.name +']'
self.k1 = k1 self.k1 = k1
self.k2 = k2 self.k2 = k2
if tensor: if tensor:
@ -130,13 +133,12 @@ class Prod(Kernpart):
self.k1.K(X[:,self.slice1],X2[:,self.slice1],self._K1) self.k1.K(X[:,self.slice1],X2[:,self.slice1],self._K1)
self.k2.K(X[:,self.slice2],X2[:,self.slice2],self._K2) self.k2.K(X[:,self.slice2],X2[:,self.slice2],self._K2)
def getstate(self): def __getstate__(self):
return [self._get_params(), self.k1, self.k2, self.slice1, self.slice2, self.name] return [self.k1, self.k2, self.slice1, self.slice2, self.name, self.input_dim, self.num_params]
def setstate(self, state): def __setstate__(self, state):
params, self.k1, self.k2, self.slice1, self.slice2, self.name = state self.k1, self.k2, self.slice1, self.slice2, self.name, self.input_dim, self.num_params = state
self._X, self._X2, self._params = np.empty(shape=(3,1)) self._X, self._X2, self._params = np.empty(shape=(3,1))
self._set_params(params)