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

assorted fixes

Browse source
This commit is contained in:
James Hensman 2014-02-06 09:28:27 +00:00
parent 75241ecf89
commit 6346af8764
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
GPy/core/parameterization/array_core.py
View file

@ -27,6 +27,7 @@ class ObservableArray(ListArray, Observable):
"""
__array_priority__ = 0 # Never give back Param
def __new__(cls, input_array):
cls.__name__ = "ObservableArray\n "
obj = super(ObservableArray, cls).__new__(cls, input_array).view(cls)
obj._observers_ = {}
return obj
@ -48,4 +49,4 @@ class ObservableArray(ListArray, Observable):
def __getslice__(self, start, stop):
return self.__getitem__(slice(start, stop))
def __setslice__(self, start, stop, val):
return self.__setitem__(slice(start, stop), val)
return self.__setitem__(slice(start, stop), val)

7
GPy/core/parameterization/parameterized.py
View file

@ -316,7 +316,10 @@ class Parameterized(Constrainable, Pickleable, Observable):
return n
def _get_params(self):
# don't overwrite this anymore!
if not self.size:
return np.empty(shape=(0,), dtype=np.float64)
return numpy.hstack([x._get_params() for x in self._parameters_ if x.size>0])
def _set_params(self, params, update=True):
# don't overwrite this anymore!
[p._set_params(params[s], update=update) for p,s in itertools.izip(self._parameters_,self._param_slices_)]
@ -330,10 +333,12 @@ class Parameterized(Constrainable, Pickleable, Observable):
return p
def _set_params_transformed(self, p):
# inverse apply transformations for parameters and set the resulting parameters
self._set_params(self._untransform_params(p))
def _untransform_params(self, p):
p = p.copy()
if self._has_fixes(): tmp = self._get_params(); tmp[self._fixes_] = p; p = tmp; del tmp
[numpy.put(p, ind, c.f(p[ind])) for c,ind in self.constraints.iteritems() if c != __fixed__]
self._set_params(p)
return p
def _name_changed(self, param, old_name):
if hasattr(self, old_name) and old_name in self._added_names_:
delattr(self, old_name)