mirror of
https://github.com/SheffieldML/GPy.git
synced 2026-05-14 22:42:37 +02:00
[paramcore] fix for traversal
This commit is contained in:
parent
851e63476c
commit
442bc3f581
1 changed files with 11 additions and 11 deletions
|
|
@ -599,14 +599,13 @@ class OptimizationHandlable(Constrainable):
|
||||||
return p
|
return p
|
||||||
|
|
||||||
def _set_params_transformed(self, p):
|
def _set_params_transformed(self, p):
|
||||||
if p is self.param_array:
|
if not(p is self.param_array):
|
||||||
p = p.copy()
|
if self.has_parent() and self.constraints[__fixed__].size != 0:
|
||||||
if self.has_parent() and self.constraints[__fixed__].size != 0:
|
fixes = np.ones(self.size).astype(bool)
|
||||||
fixes = np.ones(self.size).astype(bool)
|
fixes[self.constraints[__fixed__]] = FIXED
|
||||||
fixes[self.constraints[__fixed__]] = FIXED
|
self.param_array.flat[fixes] = p
|
||||||
self.param_array.flat[fixes] = p
|
elif self._has_fixes(): self.param_array.flat[self._fixes_] = p
|
||||||
elif self._has_fixes(): self.param_array.flat[self._fixes_] = p
|
else: self.param_array.flat = p
|
||||||
else: self.param_array.flat = p
|
|
||||||
self.untransform()
|
self.untransform()
|
||||||
self._trigger_params_changed()
|
self._trigger_params_changed()
|
||||||
|
|
||||||
|
|
@ -621,7 +620,7 @@ class OptimizationHandlable(Constrainable):
|
||||||
def num_params(self):
|
def num_params(self):
|
||||||
"""
|
"""
|
||||||
Return the number of parameters of this parameter_handle.
|
Return the number of parameters of this parameter_handle.
|
||||||
Param objects will allways return 0.
|
Param objects will always return 0.
|
||||||
"""
|
"""
|
||||||
raise NotImplemented, "Abstract, please implement in respective classes"
|
raise NotImplemented, "Abstract, please implement in respective classes"
|
||||||
|
|
||||||
|
|
@ -742,6 +741,7 @@ class Parameterizable(OptimizationHandlable):
|
||||||
self.__visited = True
|
self.__visited = True
|
||||||
for c in self._parameters_:
|
for c in self._parameters_:
|
||||||
c.traverse(visit, *args, **kwargs)
|
c.traverse(visit, *args, **kwargs)
|
||||||
|
self.__visited = False
|
||||||
|
|
||||||
def traverse_parents(self, visit, *args, **kwargs):
|
def traverse_parents(self, visit, *args, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue