Update auto-generated files

Author: arximboldi

include/nonius/detail/html_report_template.g.h++

@@ -79,6 +79,7 @@
 "    display: block;\n"
 "    padding: 0 3em 0 1.5em;\n"
 "    margin: 0.3em;\n"
+"    height: 2em;\n"
 "\n"
 "    transition: border-color 0.2s;\n"
 "    border: 2px solid #aaa;\n"
@@ -97,6 +98,18 @@
 "    color: white;\n"
 "}\n"
 "\n"
+"div.is-sorted {\n"
+"    position: absolute;\n"
+"    top: 0em;\n"
+"    right: 1em;\n"
+"    line-height: 2.8em;\n"
+"}\n"
+"\n"
+"div.is-sorted input {\n"
+"    position: relative;\n"
+"    top: 2px;\n"
+"}\n"
+"\n"
 "#plot {\n"
 "    position: absolute;\n"
 "    min-width: 300px;\n"
@@ -281,6 +294,10 @@
 "         {% endfor %}\n"
 "       </select>\n"
 "     </div>\n"
+"     <div class=\"is-sorted\">\n"
+"       <input id=\"is-sorted\" type=\"checkbox\"/>\n"
+"       <label for=\"is-sorted\">sorted</label>\n"
+"     </div>\n"
 "   </div>\n"
 "   <div id=\"plot\"></div>\n"
 "   <div id=\"footer\">Generated with <a href=\"http://flamingdangerzone.com/nonius\">nonius</a></div>\n"
@@ -311,7 +328,8 @@
 "            },{% endfor %}\n"
 "        ]\n"
 "    };\n"
-"\n"
+"    var origOrder = data.runs[0].benchmarks.map(function (_, i) { return i; })\n"
+"    var sortOrder = computeSortedOrder();\n"
 "    var plotdiv = document.getElementById(\"plot\");\n"
 "    window.addEventListener(\"resize\", function() {\n"
 "        Plotly.Plots.resize(plotdiv);\n"
@@ -322,28 +340,65 @@
 "    chooser.addEventListener(\"blur\", chooser.focus.bind(chooser));\n"
 "    chooser.focus();\n"
 "\n"
+"    var isSortedBox = document.getElementById(\"is-sorted\");\n"
+"    isSortedBox.addEventListener(\"change\", choosePlot);\n"
+"\n"
 "    var legendStyle = {\n"
 "        font: { family: 'monospace' },\n"
 "        borderwidth: 2,\n"
 "        bordercolor: 'black'\n"
 "    }\n"
 "\n"
+"    function zeroes(count) {\n"
+"        var arr = []\n"
+"        while (count --> 0) arr.push(0)\n"
+"        return arr\n"
+"    }\n"
+"\n"
+"    function computeSortedOrder() {\n"
+"        // We sort each run.  Then we compute the \"points\" of each\n"
+"        // benchmark as the sum of the positions of this benchmkark on\n"
+"        // each run.  This gives us a rough indication of which\n"
+"        // benchmark is best -- the lower the points, the better.\n"
+"        var runsOrder = data.runs.map(function (r) {\n"
+"            order = r.benchmarks.map(function (_, i) { return i; })\n"
+"            order.sort(function (a, b) {\n"
+"                return r.benchmarks[a].mean - r.benchmarks[b].mean\n"
+"            })\n"
+"            return order\n"
+"        })\n"
+"        var length = data.runs[0].benchmarks.length\n"
+"        var points = runsOrder.reduce(function (acc, r) {\n"
+"            r.forEach(function (elem, idx) {\n"
+"                acc[elem] += idx\n"
+"            })\n"
+"            return acc\n"
+"        }, zeroes(length))\n"
+"        var order = data.runs[0].benchmarks.map(function (_, i) { return i; })\n"
+"        order.sort(function (a, b) {\n"
+"            return points[a] - points[b]\n"
+"        })\n"
+"        return order\n"
+"    }\n"
+"\n"
 "    function choosePlot() {\n"
-"        var plot = chooser.options[chooser.selectedIndex].value;\n"
+"        var plot = chooser.options[chooser.selectedIndex].value\n"
+"        var order = isSortedBox.checked ? sortOrder : origOrder\n"
 "        if (plot == 'summary') {\n"
 "            if (data.runs.length > 1) {\n"
-"                plotSummary();\n"
+"                plotSummary(order);\n"
 "            } else {\n"
-"                plotSingleSummary();\n"
+"                plotSingleSummary(order);\n"
 "            }\n"
 "        } else {\n"
-"            plotSamples(plot);\n"
+"            plotSamples(plot, order);\n"
 "        }\n"
 "    }\n"
 "\n"
-"    function plotSamples(plot) {\n"
+"    function plotSamples(plot, order) {\n"
 "        var run = data.runs[plot];\n"
-"        var traces = run.benchmarks.map(function (b, i) {\n"
+"        var traces = order.map(function (i) {\n"
+"            var b = run.benchmarks[i]\n"
 "            return {\n"
 "                name: b.name,\n"
 "                type: 'scatter',\n"
@@ -367,10 +422,10 @@
 "        Plotly.newPlot(plotdiv, traces, layout);\n"
 "    }\n"
 "\n"
-"    function plotSummary() {\n"
-"        var traces = data.runs[0].benchmarks.map(function (b, i) {\n"
+"    function plotSummary(order) {\n"
+"        var traces = order.map(function (i) {\n"
 "            return {\n"
-"                name: b.name,\n"
+"                name: data.runs[0].benchmarks[i].name,\n"
 "                type: 'scatter',\n"
 "                marker: { symbol: i },\n"
 "                x: data.runs.map(function (r) { return r.params[data.param]; }),\n"
@@ -400,12 +455,13 @@
 "        Plotly.newPlot(plotdiv, traces, layout);\n"
 "    }\n"
 "\n"
-"    function plotSingleSummary() {\n"
-"        var traces = data.runs[0].benchmarks.map(function (b, i) {\n"
+"    function plotSingleSummary(order) {\n"
+"        var traces = order.map(function (i) {\n"
+"            var b = data.runs[0].benchmarks[i]\n"
 "            return {\n"
 "                type: 'bar',\n"
 "                name: b.name,\n"
-"                x: [ 0 ],\n"
+"                x: [ data.title ],\n"
 "                y: [ b.mean ],\n"
 "                error_y: {\n"
 "                    type: 'data',\n"

tpl/html_report.g.tpl

@@ -79,6 +79,7 @@
     display: block;
     padding: 0 3em 0 1.5em;
     margin: 0.3em;
+    height: 2em;
 
     transition: border-color 0.2s;
     border: 2px solid #aaa;
@@ -97,6 +98,18 @@
     color: white;
 }
 
+div.is-sorted {
+    position: absolute;
+    top: 0em;
+    right: 1em;
+    line-height: 2.8em;
+}
+
+div.is-sorted input {
+    position: relative;
+    top: 2px;
+}
+
 #plot {
     position: absolute;
     min-width: 300px;
@@ -161,6 +174,10 @@ e.exports=function(t,e,n){function l(n,r){return o.coerce(t,e,i,n,r)}for(var s=!
          {% endfor %}
        </select>
      </div>
+     <div class="is-sorted">
+       <input id="is-sorted" type="checkbox"/>
+       <label for="is-sorted">sorted</label>
+     </div>
    </div>
    <div id="plot"></div>
    <div id="footer">Generated with <a href="http://flamingdangerzone.com/nonius">nonius</a></div>
@@ -191,7 +208,8 @@ e.exports=function(t,e,n){function l(n,r){return o.coerce(t,e,i,n,r)}for(var s=!
             },{% endfor %}
         ]
     };
-
+    var origOrder = data.runs[0].benchmarks.map(function (_, i) { return i; })
+    var sortOrder = computeSortedOrder();
     var plotdiv = document.getElementById("plot");
     window.addEventListener("resize", function() {
         Plotly.Plots.resize(plotdiv);
@@ -202,28 +220,65 @@ e.exports=function(t,e,n){function l(n,r){return o.coerce(t,e,i,n,r)}for(var s=!
     chooser.addEventListener("blur", chooser.focus.bind(chooser));
     chooser.focus();
 
+    var isSortedBox = document.getElementById("is-sorted");
+    isSortedBox.addEventListener("change", choosePlot);
+
     var legendStyle = {
         font: { family: 'monospace' },
         borderwidth: 2,
         bordercolor: 'black'
     }
 
+    function zeroes(count) {
+        var arr = []
+        while (count --> 0) arr.push(0)
+        return arr
+    }
+
+    function computeSortedOrder() {
+        // We sort each run.  Then we compute the "points" of each
+        // benchmark as the sum of the positions of this benchmkark on
+        // each run.  This gives us a rough indication of which
+        // benchmark is best -- the lower the points, the better.
+        var runsOrder = data.runs.map(function (r) {
+            order = r.benchmarks.map(function (_, i) { return i; })
+            order.sort(function (a, b) {
+                return r.benchmarks[a].mean - r.benchmarks[b].mean
+            })
+            return order
+        })
+        var length = data.runs[0].benchmarks.length
+        var points = runsOrder.reduce(function (acc, r) {
+            r.forEach(function (elem, idx) {
+                acc[elem] += idx
+            })
+            return acc
+        }, zeroes(length))
+        var order = data.runs[0].benchmarks.map(function (_, i) { return i; })
+        order.sort(function (a, b) {
+            return points[a] - points[b]
+        })
+        return order
+    }
+
     function choosePlot() {
-        var plot = chooser.options[chooser.selectedIndex].value;
+        var plot = chooser.options[chooser.selectedIndex].value
+        var order = isSortedBox.checked ? sortOrder : origOrder
         if (plot == 'summary') {
             if (data.runs.length > 1) {
-                plotSummary();
+                plotSummary(order);
             } else {
-                plotSingleSummary();
+                plotSingleSummary(order);
             }
         } else {
-            plotSamples(plot);
+            plotSamples(plot, order);
         }
     }
 
-    function plotSamples(plot) {
+    function plotSamples(plot, order) {
         var run = data.runs[plot];
-        var traces = run.benchmarks.map(function (b, i) {
+        var traces = order.map(function (i) {
+            var b = run.benchmarks[i]
             return {
                 name: b.name,
                 type: 'scatter',
@@ -247,10 +302,10 @@ e.exports=function(t,e,n){function l(n,r){return o.coerce(t,e,i,n,r)}for(var s=!
         Plotly.newPlot(plotdiv, traces, layout);
     }
 
-    function plotSummary() {
-        var traces = data.runs[0].benchmarks.map(function (b, i) {
+    function plotSummary(order) {
+        var traces = order.map(function (i) {
             return {
-                name: b.name,
+                name: data.runs[0].benchmarks[i].name,
                 type: 'scatter',
                 marker: { symbol: i },
                 x: data.runs.map(function (r) { return r.params[data.param]; }),
@@ -280,12 +335,13 @@ e.exports=function(t,e,n){function l(n,r){return o.coerce(t,e,i,n,r)}for(var s=!
         Plotly.newPlot(plotdiv, traces, layout);
     }
 
-    function plotSingleSummary() {
-        var traces = data.runs[0].benchmarks.map(function (b, i) {
+    function plotSingleSummary(order) {
+        var traces = order.map(function (i) {
+            var b = data.runs[0].benchmarks[i]
             return {
                 type: 'bar',
                 name: b.name,
-                x: [ 0 ],
+                x: [ data.title ],
                 y: [ b.mean ],
                 error_y: {
                     type: 'data',

tpl/html_report.tpl

@@ -22,6 +22,10 @@
          {% endfor %}
        </select>
      </div>
+     <div class="is-sorted">
+       <input id="is-sorted" type="checkbox"/>
+       <label for="is-sorted">sorted</label>
+     </div>
    </div>
    <div id="plot"></div>
    <div id="footer">Generated with <a href="http://flamingdangerzone.com/nonius">nonius</a></div>