apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-05-11 21:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changes according to new likelihoods definition

Browse source
This commit is contained in:
Ricardo 2013-09-13 12:26:50 +01:00
parent 1b54365f7c
commit 6533f7792f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/models/fitc_classification.py
View file

@ -31,8 +31,8 @@ class FITCClassification(FITC):
kernel = kern.rbf(X.shape[1]) + kern.white(X.shape[1],1e-3) kernel = kern.rbf(X.shape[1]) + kern.white(X.shape[1],1e-3)
if likelihood is None: if likelihood is None:
distribution = likelihoods.likelihood_functions.Binomial() noise_model = likelihoods.binomial()
likelihood = likelihoods.EP(Y, distribution) likelihood = likelihoods.EP(Y, noise_model)
elif Y is not None: elif Y is not None:
if not all(Y.flatten() == likelihood.data.flatten()): if not all(Y.flatten() == likelihood.data.flatten()):
raise Warning, 'likelihood.data and Y are different.' raise Warning, 'likelihood.data and Y are different.'

6
GPy/models/sparse_gp_classification.py
View file

@ -28,11 +28,11 @@ class SparseGPClassification(SparseGP):
def __init__(self, X, Y=None, likelihood=None, kernel=None, normalize_X=False, normalize_Y=False, Z=None, num_inducing=10): def __init__(self, X, Y=None, likelihood=None, kernel=None, normalize_X=False, normalize_Y=False, Z=None, num_inducing=10):
if kernel is None: if kernel is None:
kernel = kern.rbf(X.shape[1]) + kern.white(X.shape[1],1e-3) kernel = kern.rbf(X.shape[1])# + kern.white(X.shape[1],1e-3)
if likelihood is None: if likelihood is None:
distribution = likelihoods.likelihood_functions.Binomial() noise_model = likelihoods.binomial()
likelihood = likelihoods.EP(Y, distribution) likelihood = likelihoods.EP(Y, noise_model)
elif Y is not None: elif Y is not None:
if not all(Y.flatten() == likelihood.data.flatten()): if not all(Y.flatten() == likelihood.data.flatten()):
raise Warning, 'likelihood.data and Y are different.' raise Warning, 'likelihood.data and Y are different.'