TEST: Tests use 'lbfgsb' optimization function. Also some syntactic changes.

This commit is contained in:
Alexander Grigorievskiy 2016-03-15 17:01:05 +02:00
parent 7ecaf92ace
commit f0660dcde0
2 changed files with 1199 additions and 1159 deletions

File diff suppressed because it is too large Load diff

View file

@ -31,10 +31,8 @@ class StateSpaceKernelsTests(np.testing.TestCase):
if check_gradients: if check_gradients:
self.assertTrue(m1.checkgrad()) self.assertTrue(m1.checkgrad())
#import pdb; pdb.set_trace()
if optimize: if optimize:
m1.optimize(optimizer='bfgs',max_iters=optimize_max_iters) m1.optimize(optimizer='lbfgsb',max_iters=optimize_max_iters)
if compare_with_GP and (predict_X is None): if compare_with_GP and (predict_X is None):
predict_X = X predict_X = X
@ -45,7 +43,7 @@ class StateSpaceKernelsTests(np.testing.TestCase):
if compare_with_GP: if compare_with_GP:
m2 = GPy.models.GPRegression(X,Y, gp_kernel) m2 = GPy.models.GPRegression(X,Y, gp_kernel)
m2.optimize(optimizer='bfgs', max_iters=optimize_max_iters) m2.optimize(optimizer='lbfgsb', max_iters=optimize_max_iters)
#print(m2) #print(m2)
x_pred_reg_2 = m2.predict(predict_X) x_pred_reg_2 = m2.predict(predict_X)