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

whitespaces

Browse source
This commit is contained in:
Max Zwiessele 2014-03-13 09:00:31 +00:00
parent 58523eaa3a
commit 8f7d8537b7
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@ Observable Pattern for patameterization
from transformations import Transformation, Logexp, NegativeLogexp, Logistic, __fixed__, FIXED, UNFIXED from transformations import Transformation, Logexp, NegativeLogexp, Logistic, __fixed__, FIXED, UNFIXED
import numpy as np import numpy as np
__updated__ = '2014-03-12' __updated__ = '2014-03-13'
class HierarchyError(Exception): class HierarchyError(Exception):
""" """
@ -644,10 +644,10 @@ class OptimizationHandlable(Constrainable, Observable):
self._param_array_[pislice] = pi._param_array_.ravel()#, requirements=['C', 'W']).flat self._param_array_[pislice] = pi._param_array_.ravel()#, requirements=['C', 'W']).flat
self._gradient_array_[pislice] = pi._gradient_array_.ravel()#, requirements=['C', 'W']).flat self._gradient_array_[pislice] = pi._gradient_array_.ravel()#, requirements=['C', 'W']).flat
pi._param_array_.data = parray[pislice].data pi._param_array_.data = parray[pislice].data
pi._gradient_array_.data = garray[pislice].data pi._gradient_array_.data = garray[pislice].data
pi._propagate_param_grad(parray[pislice], garray[pislice]) pi._propagate_param_grad(parray[pislice], garray[pislice])
pi_old_size += pi.size pi_old_size += pi.size
@ -660,11 +660,11 @@ class Parameterizable(OptimizationHandlable):
self._param_array_ = np.empty(self.size, dtype=np.float64) self._param_array_ = np.empty(self.size, dtype=np.float64)
self._gradient_array_ = np.empty(self.size, dtype=np.float64) self._gradient_array_ = np.empty(self.size, dtype=np.float64)
self._added_names_ = set() self._added_names_ = set()
def parameter_names(self, add_self=False, adjust_for_printing=False, recursive=True): def parameter_names(self, add_self=False, adjust_for_printing=False, recursive=True):
""" """
Get the names of all parameters of this model. Get the names of all parameters of this model.
:param bool add_self: whether to add the own name in front of names :param bool add_self: whether to add the own name in front of names
:param bool adjust_for_printing: whether to call `adjust_name_for_printing` on names :param bool adjust_for_printing: whether to call `adjust_name_for_printing` on names
:param bool recursive: whether to traverse through hierarchy and append leaf node names :param bool recursive: whether to traverse through hierarchy and append leaf node names
@ -675,11 +675,11 @@ class Parameterizable(OptimizationHandlable):
else: names = [adjust(x.name) for x in self._parameters_] else: names = [adjust(x.name) for x in self._parameters_]
if add_self: names = map(lambda x: adjust(self.name) + "." + x, names) if add_self: names = map(lambda x: adjust(self.name) + "." + x, names)
return names return names
@property @property
def num_params(self): def num_params(self):
return len(self._parameters_) return len(self._parameters_)
def _add_parameter_name(self, param, ignore_added_names=False): def _add_parameter_name(self, param, ignore_added_names=False):
pname = adjust_name_for_printing(param.name) pname = adjust_name_for_printing(param.name)
if ignore_added_names: if ignore_added_names:
@ -694,7 +694,7 @@ class Parameterizable(OptimizationHandlable):
elif pname not in dir(self): elif pname not in dir(self):
self.__dict__[pname] = param self.__dict__[pname] = param
self._added_names_.add(pname) self._added_names_.add(pname)
def _remove_parameter_name(self, param=None, pname=None): def _remove_parameter_name(self, param=None, pname=None):
assert param is None or pname is None, "can only delete either param by name, or the name of a param" assert param is None or pname is None, "can only delete either param by name, or the name of a param"
pname = adjust_name_for_printing(pname) or adjust_name_for_printing(param.name) pname = adjust_name_for_printing(pname) or adjust_name_for_printing(param.name)
@ -706,14 +706,14 @@ class Parameterizable(OptimizationHandlable):
def _name_changed(self, param, old_name): def _name_changed(self, param, old_name):
self._remove_parameter_name(None, old_name) self._remove_parameter_name(None, old_name)
self._add_parameter_name(param) self._add_parameter_name(param)
#========================================================================= #=========================================================================
# Gradient handling # Gradient handling
#========================================================================= #=========================================================================
@property @property
def gradient(self): def gradient(self):
return self._gradient_array_ return self._gradient_array_
@gradient.setter @gradient.setter
def gradient(self, val): def gradient(self, val):
self._gradient_array_[:] = val self._gradient_array_[:] = val
@ -734,13 +734,13 @@ class Parameterizable(OptimizationHandlable):
# def _set_gradient(self, g): # def _set_gradient(self, g):
# [p._set_gradient(g[s]) for p, s in itertools.izip(self._parameters_, self._param_slices_)] # [p._set_gradient(g[s]) for p, s in itertools.izip(self._parameters_, self._param_slices_)]
#=========================================================================== #===========================================================================
def add_parameter(self, param, index=None, _ignore_added_names=False): def add_parameter(self, param, index=None, _ignore_added_names=False):
""" """
:param parameters: the parameters to add :param parameters: the parameters to add
:type parameters: list of or one :py:class:`GPy.core.param.Param` :type parameters: list of or one :py:class:`GPy.core.param.Param`
:param [index]: index of where to put parameters :param [index]: index of where to put parameters
:param bool _ignore_added_names: whether the name of the parameter overrides a possibly existing field :param bool _ignore_added_names: whether the name of the parameter overrides a possibly existing field
Add all parameters to this param class, you can insert parameters Add all parameters to this param class, you can insert parameters
@ -771,9 +771,9 @@ class Parameterizable(OptimizationHandlable):
self.constraints.update(param.constraints, start) self.constraints.update(param.constraints, start)
self.priors.update(param.priors, start) self.priors.update(param.priors, start)
self._parameters_.insert(index, param) self._parameters_.insert(index, param)
param.add_observer(self, self._pass_through_notify_observers, -np.inf) param.add_observer(self, self._pass_through_notify_observers, -np.inf)
self.size += param.size self.size += param.size
self._connect_parameters(ignore_added_names=_ignore_added_names) self._connect_parameters(ignore_added_names=_ignore_added_names)

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

@ -101,7 +101,6 @@ class Parameterized(Parameterizable, Pickleable):
return G return G
return node return node
def _getstate(self): def _getstate(self):
""" """
Get the current state of the class, Get the current state of the class,