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

manual merging

Browse source
This commit is contained in:
James Hensman 2014-02-21 10:41:34 +00:00
commit 81e0861a60
8 changed files with 150 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ __precision__ = numpy.get_printoptions()['precision'] # numpy printing precision
__print_threshold__ = 5
######
class Param(ObservableArray, Constrainable, Gradcheckable, Indexable, Parentable):
class Param(Constrainable, ObservableArray, Gradcheckable, Indexable):
"""
Parameter object for GPy models.
@ -57,8 +57,8 @@ class Param(ObservableArray, Constrainable, Gradcheckable, Indexable, Parentable
obj._gradient_ = None
return obj
def __init__(self, name, input_array, default_constraint=None):
super(Param, self).__init__(name=name, default_constraint=default_constraint)
def __init__(self, name, input_array, default_constraint=None, *a, **kw):
super(Param, self).__init__(name=name, default_constraint=default_constraint, *a, **kw)
def __array_finalize__(self, obj):
# see InfoArray.__array_finalize__ for comments
@ -146,6 +146,9 @@ class Param(ObservableArray, Constrainable, Gradcheckable, Indexable, Parentable
def _collect_gradient(self, target):
target += self.gradient.flat
def _set_gradient(self, g):
self.gradient = g
#===========================================================================
# Array operations -> done
#===========================================================================