From 76fda8e5b37c82a25197ba48e4562cfa14b310af Mon Sep 17 00:00:00 2001 From: Alan Saul Date: Fri, 8 Feb 2013 12:12:50 +0000 Subject: [PATCH] Fixed some broken imports (likelihoods has moved), remember to tell everyone to delete their pyc file --- GPy/models/generalized_FITC.py | 4 ++-- GPy/models/uncollapsed_sparse_GP.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GPy/models/generalized_FITC.py b/GPy/models/generalized_FITC.py index 57ae2407..5c88d44d 100644 --- a/GPy/models/generalized_FITC.py +++ b/GPy/models/generalized_FITC.py @@ -10,8 +10,8 @@ from ..core import model from ..util.linalg import pdinv,mdot from ..util.plot import gpplot #from ..inference.Expectation_Propagation import FITC -from ..inference.EP import FITC -from ..inference.likelihoods import likelihood,probit +from ..likelihoods.EP import FITC +from ..likelihoods import likelihood,probit class generalized_FITC(model): def __init__(self,X,likelihood,kernel=None,inducing=10,epsilon_ep=1e-3,powerep=[1.,1.]): diff --git a/GPy/models/uncollapsed_sparse_GP.py b/GPy/models/uncollapsed_sparse_GP.py index 3bb72e60..0fccfc71 100644 --- a/GPy/models/uncollapsed_sparse_GP.py +++ b/GPy/models/uncollapsed_sparse_GP.py @@ -6,7 +6,7 @@ import pylab as pb from ..util.linalg import mdot, jitchol, chol_inv, pdinv from ..util.plot import gpplot from .. import kern -from ..inference.likelihoods import likelihood +from ..likelihoods import likelihood from sparse_GP_regression import sparse_GP_regression class uncollapsed_sparse_GP(sparse_GP_regression): @@ -136,8 +136,8 @@ class uncollapsed_sparse_GP(sparse_GP_regression): #dL_dm = np.dot(self.Kmmi,self.psi1V) - np.dot(self.Lambda,self.q_u_mean) dL_dm = np.dot(self.Kmmi,self.psi1V) - self.q_u_canonical[0] - #dL_dSim = - #dL_dmhSi = + #dL_dSim = + #dL_dmhSi = return np.hstack((dL_dm.flatten(),dL_dmmT_S.flatten())) # natgrad only, grad TODO