graph: translate_dict() now also sort the labels

bh107 · Apr 19, 2017 · 461fb6d · 461fb6d
1 parent 1f679be
commit 461fb6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/module/benchpress/grapher/bar_per_script.py b/module/benchpress/grapher/bar_per_script.py
@@ -143,8 +143,8 @@ def render(self):
         scripts.sort()
 
         # Get translation of the components and scripts
-        comp_dict = translate_dict(comps, self.args.stack_map)
-        script_dict = translate_dict(scripts, self.args.script_map)
+        (comp_dict, comps) = translate_dict(comps, self.args.stack_map)
+        (script_dict, scripts) = translate_dict(scripts, self.args.script_map)
 
         # Convert to a bar-plot friendly format
         data = []

diff --git a/module/benchpress/grapher/graph.py b/module/benchpress/grapher/graph.py
@@ -75,16 +75,19 @@ def translate_dict(names, name_map):
 
     names = list(names)
     ret = {}
+    ret_list = []
     for (old, new) in name_map:
         if len(new) > 0:
             for i in range(len(names)):
                 if re.search(old, names[i]) is not None:
                     ret[names[i]] = new
+                    ret_list.append(names[i])
                     names.pop(i)
                     break
     for old, new in [(t, t) for t in names]:
         ret[old] = new
-    return ret
+        ret_list.append(old)
+    return ret, ret_list
 
 
 class Grapher(object):