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

right active dims when adding kernels

Browse source
This commit is contained in:
Max Zwiessele 2014-03-27 13:08:54 +00:00
parent e26e737014
commit d5a8e5dd3a
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/kern/_src/add.py
View file

@ -176,5 +176,7 @@ class Add(CombinationKernel):
for p in other_params: for p in other_params:
other.remove_parameter(p) other.remove_parameter(p)
self.add_parameters(*other_params) self.add_parameters(*other_params)
else: self.add_parameter(other) else:
self.add_parameter(other)
self.input_dim, self.active_dims = self.get_input_dim_active_dims(self.parts)
return self return self

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

@ -208,9 +208,7 @@ class CombinationKernel(Kern):
:param array-like|slice extra_dims: if needed extra dimensions for the combination kernel to work on :param array-like|slice extra_dims: if needed extra dimensions for the combination kernel to work on
""" """
assert all([isinstance(k, Kern) for k in kernels]) assert all([isinstance(k, Kern) for k in kernels])
active_dims = reduce(np.union1d, (np.r_[x.active_dims] for x in kernels), np.array([], dtype=int)) input_dim, active_dims = self.get_input_dim_active_dims(kernels, extra_dims)
input_dim = active_dims.max()+1 + len(extra_dims)
active_dims = slice(active_dims.max()+1+len(extra_dims))
# initialize the kernel with the full input_dim # initialize the kernel with the full input_dim
super(CombinationKernel, self).__init__(input_dim, active_dims, name) super(CombinationKernel, self).__init__(input_dim, active_dims, name)
self.extra_dims = extra_dims self.extra_dims = extra_dims
@ -220,6 +218,12 @@ class CombinationKernel(Kern):
def parts(self): def parts(self):
return self._parameters_ return self._parameters_
def get_input_dim_active_dims(self, kernels, extra_dims = None):
active_dims = reduce(np.union1d, (np.r_[x.active_dims] for x in kernels), np.array([], dtype=int))
input_dim = active_dims.max()+1 + (len(extra_dims) if extra_dims is not None else 0)
active_dims = slice(input_dim)
return input_dim, active_dims
def input_sensitivity(self): def input_sensitivity(self):
in_sen = np.zeros((self.num_params, self.input_dim)) in_sen = np.zeros((self.num_params, self.input_dim))
for i, p in enumerate(self.parts): for i, p in enumerate(self.parts):