pop better report on complete maxlik in jupyter

jpn-- · Jan 27, 2017 · 6596fc3 · 6596fc3
1 parent 6b26acf
commit 6596fc3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/py/model_reporter/art.py b/py/model_reporter/art.py
@@ -1408,7 +1408,7 @@ def art_simple_parameters(self, foot=None):
 			a.footnotes.append(str(foot))
 		return a
 
-	def _art_simple_status(self, *arg_ignored, **kwarg_ignored):
+	def _art_running_status(self, *arg_ignored, **kwarg_ignored):
 		from ..jupyter import jupyter_active
 		if jupyter_active:
 			try:
@@ -1424,3 +1424,12 @@ def _art_simple_status(self, *arg_ignored, **kwarg_ignored):
 				"At iteration {}".format(iterat),
 				"Convergence Tolerance = {}".format(self.bhhh_tolerance()),
 			]))
+
+
+	def _display_finalized_status(self, result=None, *arg_ignored, **kwarg_ignored):
+		from ..jupyter import jupyter_active
+		if jupyter_active:
+			from IPython import display
+			display.clear_output(wait=True)
+			display.display_html(self.xhtml('!'))
+
diff --git a/py/util/optimize/__init__.py b/py/util/optimize/__init__.py
@@ -42,7 +42,7 @@ def optimizers(model, *arg, ctol=1e-7):
 	ot = OptimizeTechniques(ctol=ctol, ctol_fun=model.bhhh_tolerance, logger=model.logger(),
 							fun = model.negative_loglike, bhhh = model.bhhh,
 							jac = model.negative_d_loglike,
-							callback=model._art_simple_status,
+							callback=model._art_running_status,
 							)
 	for a in arg:
 		if isinstance(a,dict):
@@ -461,6 +461,8 @@ def maximize_loglike(model, *arg, ctol=1e-6, options={}, metaoptions=None, two_s
 	if stash:
 		model.stash_parameters(ticket=stash)
 
+	model._display_finalized_status(r)
+
 	return r