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

updated naming to be consistent

Browse source
This commit is contained in:
Max Zwiessele 2014-02-19 15:50:13 +00:00
parent c4f6b0dbe7
commit fd0dd8df85
3 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -238,11 +238,6 @@ class Param(ObservableArray, Constrainable, Gradcheckable, Indexable, Parentable
@property @property
def _ties_str(self): def _ties_str(self):
return [t._short() for t in self._tied_to_] or [''] return [t._short() for t in self._tied_to_] or ['']
@property
def name_hirarchical(self):
if self.has_parent():
return self._direct_parent_.hirarchy_name() + adjust_name_for_printing(self.name)
return adjust_name_for_printing(self.name)
def __repr__(self, *args, **kwargs): def __repr__(self, *args, **kwargs):
name = "\033[1m{x:s}\033[0;0m:\n".format( name = "\033[1m{x:s}\033[0;0m:\n".format(
x=self.name_hirarchical) x=self.name_hirarchical)
@ -284,7 +279,7 @@ class Param(ObservableArray, Constrainable, Gradcheckable, Indexable, Parentable
return reduce(lambda a, b:max(a, len(str(b))), ind, len(__index_name__)) return reduce(lambda a, b:max(a, len(str(b))), ind, len(__index_name__))
def _short(self): def _short(self):
# short string to print # short string to print
name = self._direct_parent_.hirarchy_name() + adjust_name_for_printing(self.name) name = self.hirarchy_name()
if self._realsize_ < 2: if self._realsize_ < 2:
return name return name
ind = self._indices() ind = self._indices()

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

@ -88,6 +88,10 @@ class Nameable(Parentable):
self._name = name self._name = name
if self.has_parent(): if self.has_parent():
self._direct_parent_._name_changed(self, from_name) self._direct_parent_._name_changed(self, from_name)
def hirarchy_name(self):
if self.has_parent():
return self._direct_parent_.hirarchy_name() + "." + adjust_name_for_printing(self.name)
return adjust_name_for_printing(self.name)
class Parameterizable(Parentable): class Parameterizable(Parentable):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

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

@ -7,11 +7,11 @@ import cPickle
import itertools import itertools
from re import compile, _pattern_type from re import compile, _pattern_type
from param import ParamConcatenation from param import ParamConcatenation
from parameter_core import Constrainable, Pickleable, Observable, Parameterizable, adjust_name_for_printing, Gradcheckable from parameter_core import Constrainable, Pickleable, Observable, Parameterizable, Parentable, adjust_name_for_printing, Gradcheckable
from transformations import __fixed__ from transformations import __fixed__
from array_core import ParamList from array_core import ParamList
class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parameterizable): class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parameterizable, Parentable):
""" """
Parameterized class Parameterized class
@ -212,7 +212,7 @@ class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parame
# Optimization handles: # Optimization handles:
#=========================================================================== #===========================================================================
def _get_param_names(self): def _get_param_names(self):
n = numpy.array([p.name_hirarchical + '[' + str(i) + ']' for p in self.flattened_parameters for i in p._indices()]) n = numpy.array([p.hirarchy_name() + '[' + str(i) + ']' for p in self.flattened_parameters for i in p._indices()])
return n return n
def _get_param_names_transformed(self): def _get_param_names_transformed(self):
n = self._get_param_names() n = self._get_param_names()
@ -296,10 +296,6 @@ class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parame
# you can retrieve the original param through this method, by passing # you can retrieve the original param through this method, by passing
# the copy here # the copy here
return self._parameters_[param._parent_index_] return self._parameters_[param._parent_index_]
def hirarchy_name(self):
if self.has_parent():
return self._direct_parent_.hirarchy_name() + adjust_name_for_printing(self.name) + "."
return ''
#=========================================================================== #===========================================================================
# Get/set parameters: # Get/set parameters:
#=========================================================================== #===========================================================================
@ -309,8 +305,8 @@ class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parame
""" """
if not isinstance(regexp, _pattern_type): regexp = compile(regexp) if not isinstance(regexp, _pattern_type): regexp = compile(regexp)
found_params = [] found_params = []
for p in self._parameters_: for p in self.flattened_parameters:
if regexp.match(p.name) is not None: if regexp.match(p.hirarchy_name()) is not None:
found_params.append(p) found_params.append(p)
if isinstance(p, Parameterized): if isinstance(p, Parameterized):
found_params.extend(p.grep_param_names(regexp)) found_params.extend(p.grep_param_names(regexp))
@ -352,11 +348,7 @@ class Parameterized(Constrainable, Pickleable, Observable, Gradcheckable, Parame
# Printing: # Printing:
#=========================================================================== #===========================================================================
def _short(self): def _short(self):
# short string to print return self.hirarchy_name()
if self.has_parent():
return self._direct_parent_.hirarchy_name() + adjust_name_for_printing(self.name)
else:
return adjust_name_for_printing(self.name)
@property @property
def flattened_parameters(self): def flattened_parameters(self):
return [xi for x in self._parameters_ for xi in x.flattened_parameters] return [xi for x in self._parameters_ for xi in x.flattened_parameters]