Added ymin for plots and logging of CPU time in results files

Author: mtiller

text/source/_sphinxext/xogeny/gen_utils.py

@@ -77,7 +77,7 @@ def __repr__(self):
 simple_plot_tmpl = """
 # Autogenerated script to plot named %s using results: %s
 from xogeny.plot_utils import render_simple_plot
-render_simple_plot(name=%s, vars=%s, title=%s, legloc=%s, ylabel=%s, ncols=%s, ymax=%s)
+render_simple_plot(name=%s, vars=%s, title=%s, legloc=%s, ylabel=%s, ncols=%s, ymin=%s, ymax=%s)
 """;
 
 comp_plot_tmpl = """
@@ -88,7 +88,7 @@ def __repr__(self):
 """;
 
 def add_simple_plot(plot, vars, title, legloc="upper right", ylabel="",
-                    res=None, ncols=1, ymax=None):
+                    res=None, ncols=1, ymin=None, ymax=None):
     if plot in plots:
         raise NameError("Plot named "+plot+" already exists");
     if res==None:
@@ -105,6 +105,7 @@ def add_simple_plot(plot, vars, title, legloc="upper right", ylabel="",
         "ylabel": ylabel,
         "ncols": ncols,
         "ymax": ymax,
+        "ymin": ymin,
         "res": res
     };
 
@@ -151,7 +152,8 @@ def _generate_plots():
                                               repr(pdata["res"]),
                                               repr(pdata["vars"]), repr(pdata["title"]),
                                               repr(pdata["legloc"]), repr(pdata["ylabel"]),
-                                              repr(pdata["ncols"]), repr(pdata["ymax"])))
+                                              repr(pdata["ncols"]),
+                                              repr(pdata["ymin"]), repr(pdata["ymax"])))
             elif pdata["type"]=="compare":
                 ofp.write(comp_plot_tmpl % (repr(plot),
                                             repr(pdata["res1"]), repr(pdata["v1"]),
@@ -216,9 +218,9 @@ def _generate_makefile():
         directory = data["directory"]
         srcpath = data["path"]
         if len(mods)==0:
-            simflags = ""
+            simflags = "-cpu"
         else:
-            simflags = "-override "+(",".join(map(lambda x: str(x)+"="+str(mods[x]), mods)))
+            simflags = "-cpu -override "+(",".join(map(lambda x: str(x)+"="+str(mods[x]), mods)))
 
         simfails = "true" if data["simfails"] else "false"
         compfails = "true" if data["compfails"] else "false"

text/source/_sphinxext/xogeny/plot_utils.py

@@ -81,7 +81,7 @@ def render_comp_plot(name1, vars1, name2, vars2, title, legloc, ylabel):
     plt.show()
 
 
-def render_simple_plot(name, vars, title, legloc, ylabel, ncols=1, ymax=None):
+def render_simple_plot(name, vars, title, legloc, ylabel, ncols=1, ymin=None, ymax=None):
     import matplotlib.pyplot as plt
     import math
 
@@ -136,5 +136,7 @@ def render_simple_plot(name, vars, title, legloc, ylabel, ncols=1, ymax=None):
     plt.xlabel('Time [s]')
     if ymax!=None:
         plt.axis(ymax=ymax)
+    if ymin!=None:
+        plt.axis(ymin=ymin)
 
     plt.show()