apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-06-08 15:05:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel'

Browse source
This commit is contained in:
Max Zwiessele 2014-11-21 16:42:34 +00:00
commit acd9b4b2f8
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GPy/inference/optimization/optimization.py
View file

@ -225,13 +225,11 @@ class opt_SCG(Optimizer):
self.status = opt_result[3] self.status = opt_result[3]
def get_optimizer(f_min): def get_optimizer(f_min):
from sgd import opt_SGD
optimizers = {'fmin_tnc': opt_tnc, optimizers = {'fmin_tnc': opt_tnc,
'simplex': opt_simplex, 'simplex': opt_simplex,
'lbfgsb': opt_lbfgsb, 'lbfgsb': opt_lbfgsb,
'scg': opt_SCG, 'scg': opt_SCG}
'sgd': opt_SGD}
if rasm_available: if rasm_available:
optimizers['rasmussen'] = opt_rasm optimizers['rasmussen'] = opt_rasm