Further improvement of legend.

Author: marek-trtik

scripts/collect_stats.py

@@ -45,8 +45,21 @@ def _main(cmdline):
             total_time = 0.0
             for _, time in stats["table-phases"].items():
                 total_time += time
-            result[os.path.basename(xroot)] = {
-                "category": "small" if num_locations < 10000 else "big",
+            benchmark_name = os.path.basename(xroot)
+            webgoat_lessons = [
+                "Assignment5",
+                "Assignment6",
+                "BlindSendFileAssignment",
+                "CrossSiteScriptingLesson5a",
+                "SimpleXXE",
+                "SqlInjectionChallenge",
+                "SqlInjectionLesson12a",
+                "SqlInjectionLesson5a",
+                "SqlInjectionLesson5b",
+                "SqlInjectionLesson6a",
+            ]
+            result[benchmark_name] = {
+                "category": benchmark_name if benchmark_name not in webgoat_lessons else "WebGoat",
                 "num_goto_program_locations": num_locations,
                 "time_in_seconds": total_time,
                 "memory_in_mega_bytes": 0,

scripts/make_performance_scatter_plots.py

@@ -88,14 +88,15 @@ def make_scatter_plot(
     all_xs = []
     all_ys = []
     idx = 0
-    for group, points in point_groups.items():
+    for group in sorted(point_groups.keys()):
+        points = point_groups[group]
         colour, idx = choose_colour(idx)
         xs = []
         ys = []
         for x, y in points:
             xs.append(x)
             ys.append(y)
-        ax.scatter(xs, ys, color=colour, label=group + " (#" + str(len(xs)) + ")")
+        ax.scatter(xs, ys, marker="o", color=colour, label=group)
         all_xs += xs
         all_ys += ys
     ax.legend()
@@ -111,7 +112,7 @@ def make_scatter_plot(
         dx = (x_hi - x_lo) / n_steps
         lxs = sorted(all_xs + [x_lo + t * dx for t in range(n_steps + 1)])
         lys = [line_coefs[0] * x + line_coefs[1] for x in lxs]
-        ax.plot(lxs, lys, "r-")
+        ax.plot(lxs, lys, "k:")
     fig.savefig(pathname, bbox_inches='tight', format=format)