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

[renaming] now indexes names, instead of adding _

Browse source
This commit is contained in:
Max Zwiessele 2014-11-05 15:38:35 +00:00
parent 9a074b0b0f
commit ae956dab98
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,8 +18,6 @@ import numpy as np
import re import re
import logging import logging
__updated__ = '2014-11-03'
class HierarchyError(Exception): class HierarchyError(Exception):
""" """
Gets thrown when something is wrong with the parameter hierarchy. Gets thrown when something is wrong with the parameter hierarchy.
@ -896,6 +894,7 @@ class OptimizationHandlable(Indexable):
def _connect_parameters(self): def _connect_parameters(self):
pass pass
_name_digit = re.compile("(?P<name>.*)_(?P<digit>\d+)$")
class Parameterizable(OptimizationHandlable): class Parameterizable(OptimizationHandlable):
""" """
A parameterisable class. A parameterisable class.
@ -1022,29 +1021,38 @@ class Parameterizable(OptimizationHandlable):
self.__dict__[pname] = param self.__dict__[pname] = param
return return
def warn_and_retry(): def warn_and_retry(param, match=None):
print """ #===================================================================
WARNING: added a parameter with formatted name {}, # print """
which is already assigned to {}. # WARNING: added a parameter with formatted name {},
Trying to change the parameter name to # which is already assigned to {}.
# Trying to change the parameter name to
{}.{} #
""".format(pname, self.hierarchy_name(), self.hierarchy_name(), param.name + "_") # {}.{}
param.name += "_" # """.format(pname, self.hierarchy_name(), self.hierarchy_name(), param.name + "_")
#===================================================================
if match is None:
param.name += "_1"
else:
param.name = match.group('name') + "_" + str(int(match.group('digit'))+1)
self._add_parameter_name(param, ignore_added_names) self._add_parameter_name(param, ignore_added_names)
# and makes sure to not delete programmatically added parameters # and makes sure to not delete programmatically added parameters
if pname in self.__dict__: for other in self.parameters[::-1]:
if not (param is self.__dict__[pname]): if other is not param and other.name.startswith(param.name):
if pname in self._added_names_: warn_and_retry(param, _name_digit.match(other.name))
del self.__dict__[pname] return
self._add_parameter_name(param) if pname not in dir(self):
else:
warn_and_retry()
elif pname not in dir(self):
self.__dict__[pname] = param self.__dict__[pname] = param
self._added_names_.add(pname) self._added_names_.add(pname)
else: elif pname in self.__dict__:
warn_and_retry() if pname in self._added_names_:
other = self.__dict__[pname]
if not (param is other):
del self.__dict__[pname]
self._added_names_.remove(pname)
warn_and_retry(other)
warn_and_retry(param, _name_digit.match(other.name))
return
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"