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

Fixed some broken imports (likelihoods has moved), remember to tell everyone to delete their pyc file

Browse source
This commit is contained in:
Alan Saul 2013-02-08 12:12:50 +00:00
parent b92bdbbc0e
commit 76fda8e5b3
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/models/generalized_FITC.py
View file

@ -10,8 +10,8 @@ from ..core import model
from ..util.linalg import pdinv,mdot from ..util.linalg import pdinv,mdot
from ..util.plot import gpplot from ..util.plot import gpplot
#from ..inference.Expectation_Propagation import FITC #from ..inference.Expectation_Propagation import FITC
from ..inference.EP import FITC from ..likelihoods.EP import FITC
from ..inference.likelihoods import likelihood,probit from ..likelihoods import likelihood,probit
class generalized_FITC(model): class generalized_FITC(model):
def __init__(self,X,likelihood,kernel=None,inducing=10,epsilon_ep=1e-3,powerep=[1.,1.]): def __init__(self,X,likelihood,kernel=None,inducing=10,epsilon_ep=1e-3,powerep=[1.,1.]):

6
GPy/models/uncollapsed_sparse_GP.py
View file

@ -6,7 +6,7 @@ import pylab as pb
from ..util.linalg import mdot, jitchol, chol_inv, pdinv from ..util.linalg import mdot, jitchol, chol_inv, pdinv
from ..util.plot import gpplot from ..util.plot import gpplot
from .. import kern from .. import kern
from ..inference.likelihoods import likelihood from ..likelihoods import likelihood
from sparse_GP_regression import sparse_GP_regression from sparse_GP_regression import sparse_GP_regression
class uncollapsed_sparse_GP(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) - np.dot(self.Lambda,self.q_u_mean)
dL_dm = np.dot(self.Kmmi,self.psi1V) - self.q_u_canonical[0] dL_dm = np.dot(self.Kmmi,self.psi1V) - self.q_u_canonical[0]
#dL_dSim = #dL_dSim =
#dL_dmhSi = #dL_dmhSi =
return np.hstack((dL_dm.flatten(),dL_dmmT_S.flatten())) # natgrad only, grad TODO return np.hstack((dL_dm.flatten(),dL_dmmT_S.flatten())) # natgrad only, grad TODO