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

This commit is contained in:
Max Zwiessele 2014-01-24 15:56:36 +00:00
commit de9f12f6a4
2 changed files with 3 additions and 5 deletions

View file

@ -1,7 +1,6 @@
# Copyright (c) 2012, James Hensman # Copyright (c) 2012 - 2014 the GPy Austhors (see AUTHORS.txt)
# Licensed under the BSD 3-clause license (see LICENSE.txt) # Licensed under the BSD 3-clause license (see LICENSE.txt)
import numpy as np import numpy as np
from ..core import GP from ..core import GP
from .. import likelihoods from .. import likelihoods
@ -28,7 +27,7 @@ class GPRegression(GP):
likelihood = likelihoods.Gaussian() likelihood = likelihoods.Gaussian()
super(GPRegression, self).__init__(X, Y, kernel, likelihood, name='gp_regression') super(GPRegression, self).__init__(X, Y, kernel, likelihood, name='GP regression')
def _getstate(self): def _getstate(self):
return GP._getstate(self) return GP._getstate(self)

View file

@ -6,10 +6,9 @@ import numpy as np
import pylab as pb import pylab as pb
from .. import kern from .. import kern
from ..util.linalg import PCA from ..util.linalg import PCA
from ..core import GP from ..core import GP, Param
from ..likelihoods import Gaussian from ..likelihoods import Gaussian
from .. import util from .. import util
from ..core import Param
class GPLVM(GP): class GPLVM(GP):