Merge branch 'master' into devel

GPy/core/svigp.py

@@ -77,6 +77,8 @@ class SVIGP(GPBase):
         self._param_steplength_trace = []
         self._vb_steplength_trace = []
 
+        self.ensure_default_constraints()
+
     def getstate(self):
         steplength_params = [self.hbar_t, self.tau_t, self.gbar_t, self.gbar_t1, self.gbar_t2, self.hbar_tp, self.tau_tp, self.gbar_tp, self.adapt_param_steplength, self.adapt_vb_steplength, self.vb_steplength, self.param_steplength]
         return GPBase.getstate(self) + \

GPy/kern/parts/__init__.py

@@ -13,8 +13,8 @@ import linear
 import Matern32
 import Matern52
 import mlp
-import ODE_1
-import ODE_UY
+# import ODE_1
+# import ODE_UY
 import periodic_exponential
 import periodic_Matern32
 import periodic_Matern52

GPy/util/config.py

@@ -8,8 +8,8 @@ config = ConfigParser.ConfigParser()
 home = os.getenv('HOME') or os.getenv('USERPROFILE')
 user_file = os.path.join(home,'.gpy_config.cfg')
 default_file = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..', 'gpy_config.cfg'))
-print user_file, os.path.isfile(user_file)
-print default_file, os.path.isfile(default_file)
+# print user_file, os.path.isfile(user_file)
+# print default_file, os.path.isfile(default_file)
 
 # 1. check if the user has a ~/.gpy_config.cfg
 if os.path.isfile(user_file):

README.md

@@ -3,6 +3,7 @@ GPy
 
 A Gaussian processes framework in Python.
 
+* [User mailing list](https://lists.shef.ac.uk/sympa/subscribe/gpy-users)
 * [Online documentation](https://gpy.readthedocs.org/en/latest/)
 * [Unit tests (Travis-CI)](https://travis-ci.org/SheffieldML/GPy)
 

doc/tuto_GP_regression.rst

@@ -141,4 +141,4 @@ The flag ``ARD=True`` in the definition of the Matern kernel specifies that we w
     :align:   center
     :height: 350px
 
-    Contour plot of the best predictor (posterior mean).
+    Contour plot of the mean predictor (posterior mean).