apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-30 14:35:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:SheffieldML/GPy into ties

Browse source
This commit is contained in:
Zhenwen Dai 2014-09-05 10:44:05 +01:00
commit 4293f37cca
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
GPy/core/parameterization/param.py
View file

@ -258,21 +258,14 @@ class Param(Parameterizable, ObsAr):
# get a int-array containing all indices in the first axis. # get a int-array containing all indices in the first axis.
if slice_index is None: if slice_index is None:
slice_index = self._current_slice_ slice_index = self._current_slice_
if isinstance(slice_index, (tuple, list)):
clean_curr_slice = [s for s in slice_index if numpy.any(s != Ellipsis)]
for i in range(self._realndim_-len(clean_curr_slice)):
i+=1
clean_curr_slice += [range(self._realshape_[i])]
if (all(isinstance(n, (numpy.ndarray, list, tuple)) for n in clean_curr_slice)
and len(set(map(len, clean_curr_slice))) <= 1):
return numpy.fromiter(itertools.izip(*clean_curr_slice),
dtype=[('', int)] * self._realndim_, count=len(clean_curr_slice[0])).view((int, self._realndim_))
try: try:
expanded_index = list(self._expand_index(slice_index)) indices = np.indices(self._realshape_, dtype=int)
indices = numpy.fromiter(itertools.product(*expanded_index), indices = indices[(slice(None),)+slice_index]
dtype=[('', int)] * self._realndim_, count=reduce(lambda a, b: a * b.size, expanded_index, 1)).view((int, self._realndim_)) indices = np.rollaxis(indices, 0, indices.ndim).reshape(-1,2)
#print indices_
#if not np.all(indices==indices__):
# import ipdb; ipdb.set_trace()
except: except:
print "Warning: extended indexing was used"
indices = np.indices(self._realshape_, dtype=int) indices = np.indices(self._realshape_, dtype=int)
indices = indices[(slice(None),)+slice_index] indices = indices[(slice(None),)+slice_index]
indices = np.rollaxis(indices, 0, indices.ndim) indices = np.rollaxis(indices, 0, indices.ndim)

3
GPy/kern/_src/psi_comp/__init__.py
View file

@ -32,6 +32,9 @@ class PSICOMP_RBF(Pickleable):
def _setup_observers(self): def _setup_observers(self):
pass pass
def _setup_observers(self):
pass
class PSICOMP_Linear(Pickleable): class PSICOMP_Linear(Pickleable):
@Cache_this(limit=2, ignore_args=(0,)) @Cache_this(limit=2, ignore_args=(0,))

2
GPy/mappings/additive.py
View file

@ -39,7 +39,7 @@ class Additive(Mapping):
return self.mapping1._get_param_names + self.mapping2._get_param_names return self.mapping1._get_param_names + self.mapping2._get_param_names
def _get_params(self): def _get_params(self):
return np.hstack((self.mapping1._get_params() self.mapping2._get_params())) return np.hstack((self.mapping1._get_params(), self.mapping2._get_params()))
def _set_params(self, x): def _set_params(self, x):
self.mapping1._set_params(x[:self.mapping1.num_params]) self.mapping1._set_params(x[:self.mapping1.num_params])