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

bug fix for extending prod kernel

Browse source
This commit is contained in:
Zhenwen Dai 2014-09-24 15:08:02 +01:00
parent 10bfb47aa6
commit afbb8ab253
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/kern/_src/kern.py
View file

@ -162,6 +162,10 @@ class Kern(Parameterized):
def __mul__(self, other): def __mul__(self, other):
""" Here we overload the '*' operator. See self.prod for more information""" """ Here we overload the '*' operator. See self.prod for more information"""
return self.prod(other) return self.prod(other)
def __imul__(self, other):
""" Here we overload the '*' operator. See self.prod for more information"""
return self.prod(other)
def __pow__(self, other): def __pow__(self, other):
""" """
@ -183,7 +187,7 @@ class Kern(Parameterized):
:type tensor: bool :type tensor: bool
""" """
assert isinstance(other, Kern), "only kernels can be added to kernels..." assert isinstance(other, Kern), "only kernels can be multiplied to kernels..."
from prod import Prod from prod import Prod
#kernels = [] #kernels = []
#if isinstance(self, Prod): kernels.extend(self.parameters) #if isinstance(self, Prod): kernels.extend(self.parameters)

6
GPy/kern/_src/prod.py
View file

@ -18,6 +18,12 @@ class Prod(CombinationKernel):
""" """
def __init__(self, kernels, name='mul'): def __init__(self, kernels, name='mul'):
for i, kern in enumerate(kernels[:]):
if isinstance(kern, Prod):
del kernels[i]
for part in kern.parts[::-1]:
kern.unlink_parameter(part)
kernels.insert(i, part)
super(Prod, self).__init__(kernels, name) super(Prod, self).__init__(kernels, name)
@Cache_this(limit=2, force_kwargs=['which_parts']) @Cache_this(limit=2, force_kwargs=['which_parts'])