Reverted model.py

This commit is contained in:
Alan Saul 2013-02-08 16:05:01 +00:00
parent af3210396e
commit b9414c1b01

View file

@ -10,7 +10,7 @@ from parameterised import parameterised, truncate_pad
import priors import priors
from ..util.linalg import jitchol from ..util.linalg import jitchol
from ..inference import optimization from ..inference import optimization
from ..likelihoods import EP from .. import likelihoods
class model(parameterised): class model(parameterised):
def __init__(self): def __init__(self):
@ -402,7 +402,7 @@ class model(parameterised):
:type optimzer: string TODO: valid strings? :type optimzer: string TODO: valid strings?
""" """
assert isinstance(self.likelihood,EP), "EM is not available for Gaussian likelihoods" assert isinstance(self.likelihood,likelihoods.EP), "EM is not available for Gaussian likelihoods"
log_change = epsilon + 1. log_change = epsilon + 1.
self.log_likelihood_record = [] self.log_likelihood_record = []
self.gp_params_record = [] self.gp_params_record = []