Mercurial > octave-libgccjit

diff scripts/testfun/private/dump_demos.m @ 18925:87324260043d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve plot comparison scripts. * compare_plot_demos.m: pass toolkits{} to html_compare_plot_demos. Give instructions for toolkit matlab. Fix whitespace issue. * dump_demos.m: fix typo in default dir. Consistently use dump_plot_demos.m for main worker script. Create diary and error messages for inclusion in html page. Set random seed for better comparison. * html_plot_demos_template.html: Allow variable toolkits (removed hard-coded gnuplot, matlab, fltk sequence). Fix some whitespace issues. * html_compare_plot_demos.m: Rewrite docstring. The instructions are no longer needed because compare_plot_demos handles them. Add "toolkits" and column_width param. Dynamically add toolkits in html, add diary.log link.
author Andreas Weber <andy.weber.aw@gmail.com>
date Tue, 15 Jul 2014 22:18:35 +0200
parents f9cf5ae6b8a2
children 4c45986a278e
line wrap: on
line diff
--- a/scripts/testfun/private/dump_demos.m	Mon Jul 14 21:40:28 2014 -0700
+++ b/scripts/testfun/private/dump_demos.m	Tue Jul 15 22:18:35 2014 +0200
@@ -30,7 +30,7 @@
 ##
 ## @table @var
 ##   @item @var{dirs}
-##   @code{@{"plot/appearance", "plot/draw", "plot/util", "image/"@}}
+##   @code{@{"plot/appearance", "plot/draw", "plot/util", "image"@}}
 ##   @item @var{mfile}
 ##   @code{"dump.m"}
 ##   @item @var{fmt}
@@ -48,7 +48,7 @@
 
 ## Author: Søren Hauberg  <soren@hauberg.org>
 
-function dump_demos (dirs={"plot/appearance", "plot/draw", "plot/util", "image/"}, output="dump.m", fmt="png")
+function dump_demos (dirs={"plot/appearance", "plot/draw", "plot/util", "image"}, output="dump_plot_demos.m", fmt="png")
 
   if (nargin > 3)
     print_usage ();
@@ -71,6 +71,7 @@
   fprintf (fid, "function %s ()\n", funcname);
   fprintf (fid, "close all\n");
   fprintf (fid, "more off\n");
+  fprintf (fid, "diary diary.log\n");
 
   ## Run and print the demos in each directory
   for i = 1:numel (dirs)
@@ -84,6 +85,9 @@
     dump_all_demos (d, fid, fmt);
   endfor
 
+  ## Stop and flush diary
+  fprintf (fid, "diary off\n");
+
   ## Create script ending
   fprintf (fid, "end\n\n")
 
@@ -106,13 +110,18 @@
     demos = get_demos (fcn);
     for d = 1:numel (demos)
       idx = sprintf ("%02d", d);
+      base_fn = sprintf ("%s_%s", fcn, idx);
       fprintf (fid, "\ntry\n");
+      ## Invoke the ancient, deprecated random seed
+      ## generators, but there is an initialization mismatch with the more modern
+      ## generators reported here (https://savannah.gnu.org/bugs/?42557).
+      fprintf (fid, "  rand ('seed', 1);\n");
       fprintf (fid, "  %s\n\n", demos{d});
       fprintf (fid, "  drawnow;\n");
       fprintf (fid, "  fig = (get (0, 'currentfigure'));\n");
       fprintf (fid, "  if (~ isempty (fig))\n");
       fprintf (fid, "    figure (fig);\n");
-      fprintf (fid, "    name = '%s_%s.%s';\n", fcn, idx, fmt);
+      fprintf (fid, "    name = '%s.%s';\n", base_fn, fmt);
       fprintf (fid, "    if (isempty (dir (name)))\n");
       fprintf (fid, "      fprintf ('Printing ""%%s"" ... ', name);\n")
       fprintf (fid, "      print ('-d%s', name);\n", fmt);
@@ -124,7 +133,10 @@
       # Temporary fix for cruft accumulating in figure window.
       fprintf (fid, "  close ('all');\n");
       fprintf (fid, "catch\n");
-      fprintf (fid, "  fprintf ('ERROR in %s_%s: %%s\\n', lasterr ());\n", fcn, idx);
+      fprintf (fid, "  fprintf ('ERROR in %s: %%s\\n', lasterr ());\n", base_fn);
+      fprintf (fid, "  err_fid = fopen ('%s.err', 'w');\n", base_fn);
+      fprintf (fid, "  fprintf (err_fid, '%%s', lasterr ());\n");
+      fprintf (fid, "  fclose (err_fid);\n");
       fprintf (fid, "end\n\n");
     endfor
   endfor