From 574f9f4e0a90ea290404372073091b03a8c2d1bf Mon Sep 17 00:00:00 2001
From: James Hensman <james.hensman@gmail.com>
Date: Thu, 6 Dec 2012 09:21:37 -0800
Subject: [PATCH] more tidying in EP, removed examples from _module_ ( and
 opened discussion on github

---
 GPy/__init__.py                          | 2 +-
 GPy/inference/Expectation_Propagation.py | 2 +-
 GPy/models/GP_EP.py                      | 2 +-
 GPy/models/generalized_FITC.py           | 2 +-
 GPy/models/uncollapsed_sparse_GP.py      | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/GPy/__init__.py b/GPy/__init__.py
index 876e2ca6..6993d5c2 100644
--- a/GPy/__init__.py
+++ b/GPy/__init__.py
@@ -6,5 +6,5 @@ import kern
 import models
 import inference
 import util
-import examples
+#import examples TODO: discuss!
 from core import priors
diff --git a/GPy/inference/Expectation_Propagation.py b/GPy/inference/Expectation_Propagation.py
index 379bf8b7..c281578e 100644
--- a/GPy/inference/Expectation_Propagation.py
+++ b/GPy/inference/Expectation_Propagation.py
@@ -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
diff --git a/GPy/models/GP_EP.py b/GPy/models/GP_EP.py
index 5dc721a4..bb582674 100644
--- a/GPy/models/GP_EP.py
+++ b/GPy/models/GP_EP.py
@@ -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
diff --git a/GPy/models/generalized_FITC.py b/GPy/models/generalized_FITC.py
index b4953ecb..f6fef670 100644
--- a/GPy/models/generalized_FITC.py
+++ b/GPy/models/generalized_FITC.py
@@ -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):
diff --git a/GPy/models/uncollapsed_sparse_GP.py b/GPy/models/uncollapsed_sparse_GP.py
index b5d4b054..89a8ff0e 100644
--- a/GPy/models/uncollapsed_sparse_GP.py
+++ b/GPy/models/uncollapsed_sparse_GP.py
@@ -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):