Changes in / [f4fe7fd:b81ab1c6]

File:

• benchmark/plot.py (modified) (2 diffs)

benchmark/plot.py

@@ -15 +15 @@
 import numpy
 import re
-import statistics
 import sys
 
@@ -41 +40 @@
 }
 
-def plot(in_data, x, y, out):
+def plot(data, x, y, out):
         fig, ax = plt.subplots()
         colors = itertools.cycle(['#0095e3','#006cb4','#69df00','#0aa000','#fb0300','#e30002','#fd8f00','#ff7f00','#8f00d6','#4b009a','#ffff00','#b13f00'])
-        series = {} # scatter data for each individual data point
-        groups = {} # data points for x value
-        for entry in in_data:
-                name = entry[0]
-                if not name in series:
-                        series[name] = {'x':[], 'y':[]}
-
-                if not name in groups:
-                        groups[name] = {}
+        series = {}
+        for entry in data:
+                if not entry[0] in series:
+                        series[entry[0]] = {'x':[], 'y':[]}
 
                 if x in entry[2] and y in entry[2]:
-                        xval = entry[2][x]
-                        yval = entry[2][y]
-                        series[name]['x'].append(xval)
-                        series[name]['y'].append(yval)
-
-                        if not xval in groups[name]:
-                                groups[name][xval] = []
-
-                        groups[name][xval].append(yval)
-
-        lines = {} # lines from groups with min, max, median, etc.
-        for name, data in groups.items():
-                if not name in lines:
-                        lines[name] = { 'x': [], 'min':[], 'max':[], 'med':[], 'avg':[] }
-
-                for xkey in sorted(data):
-                        ys = data[xkey]
-                        lines[name]['x']  .append(xkey)
-                        lines[name]['min'].append(min(ys))
-                        lines[name]['max'].append(max(ys))
-                        lines[name]['med'].append(statistics.median(ys))
-                        lines[name]['avg'].append(statistics.mean(ys))
+                        series[entry[0]]['x'].append(entry[2][x])
+                        series[entry[0]]['y'].append(entry[2][y])
 
         for name, data in series.items():
-                _col = next(colors)
-                plt.scatter(data['x'], data['y'], color=_col, label=name, marker='x')
-                plt.plot(lines[name]['x'], lines[name]['min'], '--', color=_col)
-                plt.plot(lines[name]['x'], lines[name]['max'], '--', color=_col)
-                plt.plot(lines[name]['x'], lines[name]['med'], '-', color=_col)
+                plt.scatter(data['x'], data['y'], color=next(colors), label=name, marker='x')
 
         mx = max([max(s['x']) for s in series.values()])