manual merging

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

View file

@ -9,7 +9,7 @@ from ...core.parameterization.param import Param
class Kern(Parameterized):
def __init__(self, input_dim, name):
def __init__(self, input_dim, name, *a, **kw):
"""
The base class for a kernel: a positive definite function
which forms of a covariance function (kernel).
@ -19,7 +19,7 @@ class Kern(Parameterized):
Do not instantiate.
"""
super(Kern, self).__init__(name)
super(Kern, self).__init__(name=name, *a, **kw)
self.input_dim = input_dim
def K(self, X, X2):

View file

@ -9,7 +9,7 @@ from ...util.linalg import tdot
from ...util.misc import fast_array_equal, param_to_array
from ...core.parameterization import Param
from ...core.parameterization.transformations import Logexp
from ...util.caching import Cacher, cache_this
from ...util.caching import cache_this
class Linear(Kern):
"""