Merge pull request #1266 from herbie-fp/skip-initial-program-altns

Hide alternatives that are equal to the initial expression

Author: pavpanchekha

src/reports/make-graph.rkt

@@ -65,6 +65,7 @@
       (and (not (null? better)) (apply max better))))
 
   (define end-error (car end-errors))
+  (define alt-number 0)
 
   `(html
     (head (meta ([charset "utf-8"]))
@@ -149,11 +150,13 @@
                   [expr end-exprs]
                   [errs end-errors]
                   [cost end-costs]
-                  [history end-histories])
+                  [history end-histories]
+                  #:unless (equal? start-expr expr))
+         (set! alt-number (add1 alt-number))
          (define-values (dropdown body) (render-program expr ctx #:ident identifier))
          `(section ([id ,(format "alternative~a" i)] (class "programs"))
                    (h2 "Alternative "
-                       ,(~a i)
+                       ,(~a alt-number)
                        ": "
                        (span ((class "subhead"))
                              (data ,(format-accuracy (errors-score errs) repr-bits #:unit "%"))

src/reports/resources/report.js

@@ -290,13 +290,15 @@ const CostAccuracy = new Component('#cost-accuracy', {
         // - We make a broken line to show the real Pareto frontier
         let line = []
         let last = null;
-        for (let pt of rest_pts) {
+        rest_pts.forEach((pt, i) => {
+            let target = "alternative" + (i + 1);
+            if (!document.getElementById(target)) return;
             if (!last || pt[1] > last[1]) {
                 if (last) line.push([pt[0], last[1]]);
                 line.push([pt[0], pt[1]]);
                 last = pt;
             }
-        }
+        })
 
         const out = Plot.plot({
             marks: [
@@ -336,23 +338,23 @@ const CostAccuracy = new Component('#cost-accuracy', {
         const bits = benchmark["bits"];
         const initial_accuracy = 100*(1 - initial_pt[1]/bits);
 
+        let alt_number = 0;
         return Element("tbody", [
             Element("tr", [
                 Element("th", "Initial program"),
                 Element("td", initial_accuracy.toFixed(1) + "%"),
                 Element("td", "1.0×")
             ]),
             rest_pts.map((d, i) => {
+                let target = "alternative" + (i + 1);
+                if (!document.getElementById(target)) return;
                 let accuracy = 100*(1 - d[1]/bits);
                 let speedup = initial_pt[0]/d[0];
+                alt_number++;
                 return Element("tr", [
-                    Element("th",
-                        rest_pts.length > 1 ?
-                            Element("a", { href: "#alternative" + (i + 1)},
-                                "Alternative " + (i + 1)) 
-                            // else
-                            : "Alternative " + (i + 1)
-                    ),
+                    Element("th", [
+                        Element("a", { href: "#" + target}, "Alternative " + alt_number) 
+                    ]),
                     Element("td", { className: accuracy >= initial_accuracy ? "better" : "" },
                             accuracy.toFixed(1) + "%"),
                     Element("td", { className: speedup >= 1 ? "better" : "" },