From 328d45330ec0db9dd6b3b464f68bfb380bd53927 Mon Sep 17 00:00:00 2001 From: Zhenwen Dai Date: Thu, 10 Sep 2015 15:29:28 +0100 Subject: [PATCH 1/2] apply bug fix for set_XY --- GPy/core/gp.py | 1 + GPy/testing/model_tests.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/GPy/core/gp.py b/GPy/core/gp.py index 903044b9..f3d1697d 100644 --- a/GPy/core/gp.py +++ b/GPy/core/gp.py @@ -154,6 +154,7 @@ class GP(Model): self.link_parameter(self.X) else: self.X = ObsAr(X) + self._predictive_variable = self.X self.update_model(True) def set_X(self,X): diff --git a/GPy/testing/model_tests.py b/GPy/testing/model_tests.py index 1cfe8b48..0b74ddfb 100644 --- a/GPy/testing/model_tests.py +++ b/GPy/testing/model_tests.py @@ -14,6 +14,14 @@ class MiscTests(unittest.TestCase): self.X = np.random.uniform(-3., 3., (self.N, 1)) self.Y = np.sin(self.X) + np.random.randn(self.N, self.D) * 0.05 self.X_new = np.random.uniform(-3., 3., (self.N_new, 1)) + + def test_setXY(self): + m = GPy.models.GPRegression(self.X, self.Y) + print m.X.shape, m.Y.shape + m.set_XY(np.vstack([self.X, np.random.rand(1,self.X.shape[1])]), np.vstack([self.Y, np.random.rand(1,self.Y.shape[1])])) + m._trigger_params_changed() + self.assertTrue(m.checkgrad()) + m.predict(m.X) def test_raw_predict(self): k = GPy.kern.RBF(1) From 9758001d02e2a96bd6da9db74cde358b2593c455 Mon Sep 17 00:00:00 2001 From: Max Zwiessele Date: Thu, 10 Sep 2015 15:34:12 +0100 Subject: [PATCH 2/2] converting .md to .rst automatically now --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9a1e1f5f..0432cbad 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,8 @@ def read_to_rst(fname): try: import pypandoc #print 'Warning in installation: For rst formatting in pypi, consider installing pypandoc for conversion' - return pypandoc.convert('README.md', 'rst') + with open('README.rst', 'w') as f: + f.write(pypandoc.convert('README.md', 'rst')) except: return read(fname)