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

hierarchy edits. adding removing parameters withing hierarchy

Browse source
This commit is contained in:
Max Zwiessele 2014-02-28 16:18:47 +00:00
parent c87bda9e49
commit 47e4026141
11 changed files with 106 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,10 +112,12 @@ class Kern(Parameterized):
"""
assert isinstance(other, Kern), "only kernels can be added to kernels..."
from add import Add
return Add([self, other], tensor)
def __call__(self, X, X2=None):
return self.K(X, X2)
kernels = []
if not tensor and isinstance(self, Add): kernels.extend(self._parameters_)
else: kernels.append(self)
if not tensor and isinstance(other, Add): kernels.extend(other._parameters_)
else: kernels.append(other)
return Add(kernels, tensor)
def __mul__(self, other):
""" Here we overload the '*' operator. See self.prod for more information"""