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

Merge branch 'devel' into travis_testing

Browse source
This commit is contained in:
mzwiessele 2015-10-01 07:31:44 +01:00
commit dad7315c8a
86 changed files with 806 additions and 3227 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GPy/core/model.py
View file

@ -255,7 +255,7 @@ class Model(Parameterized):
opt.model = self
else:
optimizer = optimization.get_optimizer(optimizer)
opt = optimizer(start, model=self, max_iters=max_iters, **kwargs)
opt = optimizer(x_init=start, model=self, max_iters=max_iters, **kwargs)
with VerboseOptimization(self, opt, maxiters=max_iters, verbose=messages, ipython_notebook=ipython_notebook, clear_after_finish=clear_after_finish) as vo:
opt.run(f_fp=self._objective_grads, f=self._objective, fp=self._grads)
@ -422,7 +422,7 @@ class Model(Parameterized):
to_print.append(super(Model, self)._repr_html_())
return "\n".join(to_print)
def __str__(self):
def __str__(self, VT100=True):
model_details = [['Name', self.name],
['Log-likelihood', '{}'.format(float(self.log_likelihood()))],
["Number of Parameters", '{}'.format(self.size)],
@ -432,6 +432,6 @@ class Model(Parameterized):
from operator import itemgetter
max_len = reduce(lambda a, b: max(len(b[0]), a), model_details, 0)
to_print = [""] + ["{0:{l}} : {1}".format(name, detail, l=max_len) for name, detail in model_details] + ["Parameters:"]
to_print.append(super(Model, self).__str__())
to_print.append(super(Model, self).__str__(VT100=VT100))
return "\n".join(to_print)