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

replace _fixes_ _has_fixes_ for support of tie

Browse source
This commit is contained in:
Zhenwen Dai 2014-09-04 13:31:53 +01:00
parent 59939bd50c
commit a506f4a605
3 changed files with 55 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
GPy/core/model.py
View file

@ -275,10 +275,10 @@ class Model(Parameterized):
transformed_index = range(len(x))
else:
transformed_index = self._raveled_index_for(target_param)
if self._has_fixes():
if self._has_hidden():
indices = np.r_[:self.size]
which = (transformed_index[:, None] == indices[self._fixes_][None, :]).nonzero()
transformed_index = (indices - (~self._fixes_).cumsum())[transformed_index[which[0]]]
which = (transformed_index[:, None] == indices[self._exposed_][None, :]).nonzero()
transformed_index = (indices - (~self._exposed_).cumsum())[transformed_index[which[0]]]
if transformed_index.size == 0:
print "No free parameters to check"
@ -324,11 +324,11 @@ class Model(Parameterized):
transformed_index = param_index
else:
param_index = self._raveled_index_for(target_param)
if self._has_fixes():
if self._has_hidden():
indices = np.r_[:self.size]
which = (param_index[:, None] == indices[self._fixes_][None, :]).nonzero()
which = (param_index[:, None] == indices[self._exposed_][None, :]).nonzero()
param_index = param_index[which[0]]
transformed_index = (indices - (~self._fixes_).cumsum())[param_index]
transformed_index = (indices - (~self._exposed_).cumsum())[param_index]
# print param_index, transformed_index
else:
transformed_index = param_index