more tidying in EP, removed examples from _module_ ( and opened discussion on github

This commit is contained in:
James Hensman 2012-12-06 09:21:37 -08:00
parent 69cc506b9e
commit 574f9f4e0a
5 changed files with 6 additions and 5 deletions

View file

@ -6,5 +6,5 @@ import kern
import models
import inference
import util
import examples
#import examples TODO: discuss!
from core import priors

View file

@ -128,7 +128,7 @@ class FITC(EP_base):
:param epsilon: Convergence criterion, maximum squared difference allowed between mean updates to stop iterations (float)
:param powerep: Power-EP parameters (eta,delta) - 2x1 numpy array (floats)
"""
def __init__(self,likelihood,Knn_diag,Kmn,Kmm,*args,**kwargs)
def __init__(self,likelihood,Knn_diag,Kmn,Kmm,*args,**kwargs):
self.Knn_diag = Knn_diag
self.Kmn = Kmn
self.Kmm = Kmm

View file

@ -6,7 +6,7 @@ import numpy as np
import pylab as pb
from scipy import stats, linalg
from .. import kern
from ..inference.Expectation_Propagation import EP,Full
from ..inference.Expectation_Propagation import Full
from ..inference.likelihoods import likelihood,probit#,poisson,gaussian
from ..core import model
from ..util.linalg import pdinv,jitchol

View file

@ -9,7 +9,7 @@ from .. import kern
from ..core import model
from ..util.linalg import pdinv,mdot
from ..util.plot import gpplot
from ..inference.Expectation_Propagation import EP,Full,FITC
from ..inference.Expectation_Propagation import FITC
from ..inference.likelihoods import likelihood,probit
class generalized_FITC(model):

View file

@ -39,7 +39,8 @@ class uncollapsed_sparse_GP(sparse_GP_regression):
M = Z.shape[0]
else:
M=M
self.set_vb_param(np.hstack((np.ones(M*D)),np.eye(M).flatten()))
q_u = np.hstack((np.ones(M*D)),np.eye(M).flatten())
self.set_vb_param(q_u)
sparse_GP_regression.__init__(self, X, Y, *args, **kwargs)
def _computations(self):