Merge branch 'devel' of github.com:SheffieldML/GPy into devel

This commit is contained in:
Zhenwen Dai 2014-09-11 16:45:05 +01:00
commit 6c043ed829
2 changed files with 3 additions and 3 deletions

View file

@ -51,7 +51,7 @@ class GP(Model):
assert Y.ndim == 2
logger.info("initializing Y")
if normalizer is None:
if normalizer is True:
self.normalizer = MeanNorm()
elif normalizer is False:
self.normalizer = None

View file

@ -10,11 +10,11 @@ class Hierarchical(Kernpart):
A kernel part which can reopresent a hierarchy of indepencnce: a generalisation of independent_outputs
"""
def __init__(self,parts):
def __init__(self,parts,name='hierarchy'):
self.levels = len(parts)
self.input_dim = parts[0].input_dim + 1
self.num_params = np.sum([k.num_params for k in parts])
self.name = 'hierarchy'
self.name = name
self.parts = parts
self.param_starts = np.hstack((0,np.cumsum([k.num_params for k in self.parts[:-1]])))