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

fixed gradchecker and fixes for paramterized

Browse source
This commit is contained in:
Max Zwiessele 2014-02-12 17:30:20 +00:00
parent 35e4791db3
commit 646400f49e
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
GPy/core/model.py
View file

@ -437,7 +437,7 @@ class Model(Parameterized):
else: else:
param_list = self._raveled_index_for(target_param) param_list = self._raveled_index_for(target_param)
if self._has_fixes(): if self._has_fixes():
param_list = np.intersect1d(param_list, np.r_[:self.size][self._fixes_], True) param_list = np.intersect1d(np.r_[:self.size][self._fixes_], param_list, True)
if param_list.size == 0: if param_list.size == 0:
print "No free parameters to check" print "No free parameters to check"

2
GPy/core/parameterization/index_operations.py
View file

@ -205,7 +205,7 @@ class ParameterIndexOperationsView(object):
def remove(self, prop, indices): def remove(self, prop, indices):
removed = self._param_index_ops.remove(prop, indices+self._offset) removed = self._param_index_ops.remove(prop, indices+self._offset)
if removed.size > 0: if removed.size > 0:
return removed - self._size return removed - self._size + 1
return removed return removed

4
GPy/core/parameterization/parameter_core.py
View file

@ -145,7 +145,9 @@ class Constrainable(Nameable, Indexable, Parameterizable):
This parameter will no longer be fixed. This parameter will no longer be fixed.
""" """
unconstrained = self.unconstrain(__fixed__) unconstrained = self.unconstrain(__fixed__)
import ipdb;ipdb.set_trace()
self._highest_parent_._set_unfixed(unconstrained) self._highest_parent_._set_unfixed(unconstrained)
unfix = unconstrain_fixed unfix = unconstrain_fixed
#=========================================================================== #===========================================================================
# Constrain operations -> done # Constrain operations -> done
@ -221,7 +223,7 @@ class Constrainable(Nameable, Indexable, Parameterizable):
import numpy as np import numpy as np
removed = np.empty((0,),dtype=int) removed = np.empty((0,),dtype=int)
for t in transforms: for t in transforms:
removed = np.intersect1d(removed, self.constraints.remove(t, self._raveled_index())) removed = np.union1d(removed, self.constraints.remove(t, self._raveled_index()))
return removed return removed
def unconstrain_positive(self): def unconstrain_positive(self):