Merge branch 'master' of github.com:SheffieldML/GPy

This commit is contained in:
Max Zwiessele 2015-09-10 15:34:17 +01:00
commit 446577ca5e
2 changed files with 9 additions and 0 deletions

View file

@ -154,6 +154,7 @@ class GP(Model):
self.link_parameter(self.X) self.link_parameter(self.X)
else: else:
self.X = ObsAr(X) self.X = ObsAr(X)
self._predictive_variable = self.X
self.update_model(True) self.update_model(True)
def set_X(self,X): def set_X(self,X):

View file

@ -15,6 +15,14 @@ class MiscTests(unittest.TestCase):
self.Y = np.sin(self.X) + np.random.randn(self.N, self.D) * 0.05 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)) 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): def test_raw_predict(self):
k = GPy.kern.RBF(1) k = GPy.kern.RBF(1)
m = GPy.models.GPRegression(self.X, self.Y, kernel=k) m = GPy.models.GPRegression(self.X, self.Y, kernel=k)