apunkt/GPy
1
0
Fork 0
mirror of https://github.com/SheffieldML/GPy.git synced 2026-04-30 23:36:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:/sheffieldml/GPy into devel

Browse source
This commit is contained in:
James Hensman 2015-03-23 14:24:41 +00:00
commit efb32282de
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
GPy/core/verbose_optimization.py
View file

@ -28,19 +28,20 @@ class VerboseOptimization(object):
try: try:
from IPython.display import display from IPython.display import display
from IPython.html.widgets import FloatProgressWidget, HTMLWidget, ContainerWidget from IPython.html.widgets import IntProgress, HTML, Box, VBox, HBox, FlexBox
self.text = HTMLWidget() self.text = HTML(width='100%')
self.progress = FloatProgressWidget() self.progress = IntProgress(min=0, max=maxiters)
self.model_show = HTMLWidget() #self.progresstext = Text(width='100%', disabled=True, value='0/{}'.format(maxiters))
self.model_show = HTML()
self.ipython_notebook = ipython_notebook self.ipython_notebook = ipython_notebook
except: except:
# Not in Ipython notebook # Not in Ipython notebook
self.ipython_notebook = False self.ipython_notebook = False
if self.ipython_notebook: if self.ipython_notebook:
left_col = ContainerWidget(children = [self.progress, self.text]) left_col = VBox(children=[self.progress, self.text], padding=2, width='40%')
right_col = ContainerWidget(children = [self.model_show]) right_col = Box(children=[self.model_show], padding=2, width='60%')
self.hor_align = ContainerWidget(children = [left_col, right_col]) self.hor_align = FlexBox(children = [left_col, right_col], width='100%', orientation='horizontal')
display(self.hor_align) display(self.hor_align)
@ -105,7 +106,8 @@ class VerboseOptimization(object):
html_body += "<td class='tg-right'>{}</td>".format(val) html_body += "<td class='tg-right'>{}</td>".format(val)
html_body += "</tr>" html_body += "</tr>"
self.text.value = html_begin + html_body + html_end self.text.value = html_begin + html_body + html_end
self.progress.value = 100*(self.iteration+1)/self.maxiters self.progress.value = (self.iteration+1)
#self.progresstext.value = '0/{}'.format((self.iteration+1))
self.model_show.value = self.model._repr_html_() self.model_show.value = self.model._repr_html_()
else: else:
n_exps = exponents(self.fnow, self.current_gradient) n_exps = exponents(self.fnow, self.current_gradient)
@ -149,7 +151,7 @@ class VerboseOptimization(object):
if not self.ipython_notebook: if not self.ipython_notebook:
print '' print ''
print 'Optimization finished in {0:.5g} Seconds'.format(self.stop-self.start) print 'Optimization finished in {0:.5g} Seconds'.format(self.stop-self.start)
print 'Optimization status: {0:.5g}'.format(self.status) print 'Optimization status: {0:s}'.format(self.status)
print print
elif self.clear: elif self.clear:
self.hor_align.close() self.hor_align.close()