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

Conflicts:
	GPy/models/gp_classification.py
	GPy/models/sparse_gp_classification.py
This commit is contained in:
Ricardo 2014-04-16 14:59:04 +01:00
commit fbec4d0d0b
73 changed files with 3587 additions and 1353 deletions

View file

@ -44,11 +44,3 @@ class SparseGPClassification(SparseGP):
SparseGP.__init__(self, X, Y, Z, kernel, likelihood, inference_method=expectation_propagation_dtc.EPDTC(), name='SparseGPClassification',Y_metadata=Y_metadata)
#def __init__(self, X, Y, Z, kernel, likelihood, inference_method=None, name='sparse gp', Y_metadata=None):
def _getstate(self):
return SparseGP._getstate(self)
def _setstate(self, state):
return SparseGP._setstate(self, state)