Minor

Author: aorthey

README.md

@@ -33,6 +33,8 @@ There are two options to use the script:
 
 NOTE: default values can be found in ```config/default.json```
 
+* **--linewidth** _LINEWIDTH_ 
+  Set linewidth for the graph
 * **--max-cost** _MAX-COST_
   Specify upper bound on cost axis.
 * **--min-cost** _MIN-COST_
@@ -49,6 +51,8 @@ NOTE: default values can be found in ```config/default.json```
   Do not plot non-optimal planner.
 * **--title-name** _TITLE-NAME_ 
   Set title name
+* **--no-title**
+  Remove title name
 * **--legend-separate-file**
   Print legend as separate file.
 * **--legend-below-figure**

ompl_benchmark_plotter.py

@@ -22,16 +22,21 @@ def run_benchmark_plotter(input_arguments):
   graph_group.add_argument('--min-cost', type=float, help='Specify lower bound on cost display.')
   graph_group.add_argument('--max-time', type=float, help='Specify upper bound on time display.')
   graph_group.add_argument('--min-time', type=float, help='Specify lower bound on time display.')
+  graph_group.add_argument('--linewidth', type=float, help='Linewidth of the output.')
   graph_group.add_argument('--fontsize', type=float, help='Fontsize of title and descriptions.')
   graph_group.add_argument('--label-fontsize', type=float, help='Fontsize of tick labels.')
   graph_group.add_argument('--only-success-graph', action='store_const', const=True, help='Plot only the success graph.')
   graph_group.add_argument('--ignore-non-optimal-planner', action='store_const', const=True, help='Do not plot non-optimal planner.')
+  graph_group.add_argument('--ignore-planner', action='store', type=str, nargs='+', help='Exclude planners from graph (accepts multiple planner names)')
   graph_group.add_argument('--legend-separate-file', action='store_const', const=True, help='Print legend as separate file.')
   graph_group.add_argument('--legend-below-figure', action='store_const',
       const=True, help='Print legend below graph.')
   graph_group.add_argument('--legend-none', action='store_const',
       const=True, help='Do not print legend.')
+  graph_group.add_argument('--remove-ylabel', action='store_const',
+      const=True, help='Do not print label on y-axis.')
   graph_group.add_argument('--title-name', action='store', type=str, help='Set title name.')
+  graph_group.add_argument('--no-title', action='store_const', const=True, help='Do not set a title for this graph')
 
   args = parser.parse_args(input_arguments)
   if args.quiet:

src/database_info.py

@@ -401,6 +401,9 @@ def make_config(args):
   max_time = args.max_time if args.max_time else -1
   min_time = args.min_time if args.min_time else -1
   fontsize = args.fontsize if args.fontsize else -1
+  linewidth = args.linewidth if args.linewidth else -1
+  no_title = args.no_title if args.no_title else False
+  remove_ylabel = args.remove_ylabel if args.remove_ylabel else False
   only_success_graph = args.only_success_graph if args.only_success_graph else False
   label_fontsize = args.label_fontsize if args.label_fontsize else -1
   plot_config = {
@@ -413,8 +416,12 @@ def make_config(args):
       'max_time': max_time,
       'min_time': min_time,
       'fontsize': fontsize,
+      'no_title': no_title,
+      'linewidth': linewidth,
+      'remove_ylabel': remove_ylabel,
       'label_fontsize': label_fontsize,
       'ignore_non_optimal_planner': args.ignore_non_optimal_planner,
+      'ignore_planner': args.ignore_planner,
       'legend_below_figure': args.legend_below_figure,
       'legend_separate_file': args.legend_separate_file,
       'legend_none': args.legend_none

src/database_to_graph.py

@@ -43,6 +43,11 @@ def get_json_from_database(cursor, data, config):
   if ignore_non_optimal_planner:
     planners = remove_non_optimal_planner(planners)
 
+  ignore_planner = config["ignore_planner"]
+  if ignore_planner is not None:
+    planners = [planner for planner in planners if planner[1] not in ignore_planner]
+    print("New planner set: {}".format(planners))
+
   for planner in planners:
     planner_id = planner[0]
     planner_name = planner[1]
@@ -171,8 +176,9 @@ def plot_success(ax, data):
           linewidth=data["info"]["linewidth"], label=get_label(planner))
 
     ax.grid(True, which="both", ls='--')
-    ylabel = data["info"]["ylabel_success"]
-    ax.set_ylabel(ylabel, fontsize=fontsize)
+    if not data["info"]["remove_ylabel"]:
+      ylabel = data["info"]["ylabel_success"]
+      ax.set_ylabel(ylabel, fontsize=fontsize)
 
 def plot_optimization(ax, data, config):
 
@@ -194,7 +200,6 @@ def plot_optimization(ax, data, config):
     planner_data = data["planners"]
     for planner in planner_data:
       planner_optimization_success = planner_data[planner]["optimization_success"]
-      #color = get_color(data, planner)
       color = get_diverse_color(planner)
       if planner_optimization_success:
         planner_median = planner_data[planner]["median"]
@@ -213,7 +218,8 @@ def plot_optimization(ax, data, config):
     ylabel = data["info"]["ylabel_optimization"]
     xlabel = data["info"]["xlabel"]
     ax.set_xlabel(xlabel, fontsize=fontsize)
-    ax.set_ylabel(ylabel, fontsize=fontsize)
+    if not data["info"]["remove_ylabel"]:
+      ax.set_ylabel(ylabel, fontsize=fontsize)
 
 def json_to_graph(json_filepath, pdf_filepath, config):
     with open(json_filepath, 'r') as jsonfile:
@@ -234,10 +240,11 @@ def json_to_graph(json_filepath, pdf_filepath, config):
     label_fontsize = data["info"]["label_fontsize"]
     experiment_name = get_experiment_label(data["info"]["experiment"])
 
-    if 'title_name' in config:
-      ax_success.set_title(config['title_name'], fontsize=fontsize)
-    else:
-      ax_success.set_title(experiment_name, fontsize=fontsize)
+    if not config["no_title"]:
+      if 'title_name' in config:
+        ax_success.set_title(config['title_name'], fontsize=fontsize)
+      else:
+        ax_success.set_title(experiment_name, fontsize=fontsize)
 
     legend_title_name = 'Planner'
     if not config["legend_none"]:
@@ -257,7 +264,11 @@ def json_to_graph(json_filepath, pdf_filepath, config):
           obj.set_linewidth(data["info"]["legend_linewidth"])
         plt.setp(legend.get_title(),fontsize=label_fontsize)
 
+    ## Set ticks and label fontsizes
+    tick_padding = 0.3 * label_fontsize
     ax_success.tick_params(labelsize=label_fontsize)
+    ax_success.tick_params(axis='both', which='major', pad=tick_padding)
+
     if not config["only_success_graph"]:
       ax_cost.tick_params(labelsize=label_fontsize)
 
@@ -286,10 +297,16 @@ def plot_graph_from_databases(database_filepaths, config):
       data["info"]['min_cost'] = config['min_cost']
     if config['fontsize'] > 0:
       data["info"]['fontsize'] = config['fontsize']
+    if config['linewidth'] > 0:
+      data["info"]['linewidth'] = config['linewidth']
     if config['label_fontsize'] > 0:
       data["info"]['label_fontsize'] = config['label_fontsize']
     if config['verbosity'] > 0:
       data["info"]['verbosity'] = config['verbosity']
+    if config['remove_ylabel']:
+      data["info"]["remove_ylabel"] = True
+    else:
+      data["info"]["remove_ylabel"] = False
 
     experiment_names = []
     experiment_times = []