Merged conflict of model.py

This commit is contained in:
Neil Lawrence 2013-09-14 20:05:42 +01:00
commit dffa9541c2
42 changed files with 2297 additions and 453 deletions

View file

@ -4,15 +4,18 @@
import unittest
import numpy as np
import GPy
<<<<<<< HEAD
verbose = False
=======
>>>>>>> 1bc93747178b0bab1b7177568388ebd4207647e0
class KernelTests(unittest.TestCase):
def test_kerneltie(self):
K = GPy.kern.rbf(5, ARD=True)
K.tie_params('.*[01]')
K.constrain_fixed('2')
X = np.random.rand(5,5)
Y = np.ones((5,1))
m = GPy.models.GPRegression(X,Y,K)
@ -95,7 +98,6 @@ class KernelTests(unittest.TestCase):
self.assertTrue(GPy.kern.kern_test(kern, verbose=verbose))
if __name__ == "__main__":
print "Running unit tests, please be (very) patient..."
unittest.main()