Changed paths and model.py

This commit is contained in:
Alan Saul 2013-02-08 15:11:22 +00:00
parent 6ded811f79
commit ced1318689
2 changed files with 5 additions and 5 deletions

View file

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

View file

@ -38,10 +38,10 @@ except ImportError:
print "no sphinx"
APP_DIR = os.path.normpath(os.path.join(os.getcwd(), '../'))
PACKAGE_DIR1 = os.path.normpath(os.path.join(os.getcwd(), '../'))
#PACKAGE_DIR1 = os.path.normpath(os.path.join(os.getcwd(), '../'))
sys.path.insert(0, APP_DIR)
sys.path.insert(0, PACKAGE_DIR1)
sys.path.insert(0, os.path.abspath('../GPy'))
#sys.path.insert(0, PACKAGE_DIR1)
#sys.path.insert(0, os.path.abspath('../GPy'))
print "sys.path:", sys.path
#sys.path.insert(0, os.getcwd() + "/..")