Make summary table vertical

Author: Kobzol

site/src/comparison.rs

@@ -476,55 +476,23 @@ pub fn write_summary_table(
         let value = if count > 0 { calculate() } else { None };
         value
             .map(|value| format!("{value:.1}%"))
-            .unwrap_or_else(|| "N/A".to_string())
+            .unwrap_or_else(|| "".to_string())
     }
 
-    let columns = [
-        "          ", // we want at least 10 spaces to accommodate "count[^1]"
-        "Regressions 😿 <br />(primary)",
-        "Regressions 😿 <br />(secondary)",
-        "Improvements 🎉 <br />(primary)",
-        "Improvements 🎉 <br />(secondary)",
-        "All 😿 🎉 <br />(primary)",
-    ];
-    let counts: Vec<usize> = columns
-        .iter()
-        .map(|s| {
-            // Unicode emojis usually have width equal to ~2 chars (maybe? :) ).
-            let count = s.chars().count();
-            if s.chars().any(|c| !c.is_whitespace()) {
-                count + 1
-            } else {
-                count
-            }
-        })
-        .collect();
-    for column in &columns {
-        write!(result, "| {} ", column).unwrap();
-    }
-    result.push_str("|\n");
-    for &count in &counts {
-        write!(result, "|:{}:", "-".repeat(count)).unwrap();
-    }
-    result.push_str("|\n");
+    // (label, mean, max, count)
+    let mut column_data = vec![];
 
-    let mut render_row = |row: Vec<String>| {
-        debug_assert_eq!(row.len(), columns.len());
-        for (column, &count) in row.into_iter().zip(&counts) {
-            write!(result, "| {:<1$} ", column, count).unwrap();
-        }
-        result.push_str("|\n");
-    };
-    render_row(vec![
-        format!("count{}", if with_footnotes { "[^1]" } else { "" }),
-        primary.num_regressions.to_string(),
-        secondary.num_regressions.to_string(),
-        primary.num_improvements.to_string(),
-        secondary.num_improvements.to_string(),
-        (primary.num_regressions + primary.num_improvements).to_string(),
+    // label
+    column_data.push(vec![
+        "Worse (primary)".to_string(),
+        "Worse (secondary)".to_string(),
+        "Better (primary)".to_string(),
+        "Better (secondary)".to_string(),
+        "All (primary)".to_string(),
     ]);
-    render_row(vec![
-        format!("mean{}", if with_footnotes { "[^2]" } else { "" }),
+
+    // mean
+    column_data.push(vec![
         render_stat(primary.num_regressions, || {
             Some(primary.arithmetic_mean_of_regressions())
         }),
@@ -538,7 +506,7 @@ pub fn write_summary_table(
             Some(secondary.arithmetic_mean_of_improvements())
         }),
         if primary.is_empty() {
-            "N/A".to_string()
+            "".to_string()
         } else {
             format!("{:.1}%", primary.arithmetic_mean_of_changes())
         },
@@ -569,8 +537,8 @@ pub fn write_summary_table(
         format!("{:.1}%", change * 100.0)
     };
 
-    render_row(vec![
-        "max".to_string(),
+    // max
+    column_data.push(vec![
         render_stat(primary.num_regressions, || {
             primary
                 .largest_regression()
@@ -593,14 +561,55 @@ pub fn write_summary_table(
         }),
         largest_change,
     ]);
+
+    // count
+    column_data.push(vec![
+        primary.num_regressions.to_string(),
+        secondary.num_regressions.to_string(),
+        primary.num_improvements.to_string(),
+        secondary.num_improvements.to_string(),
+        (primary.num_regressions + primary.num_improvements).to_string(),
+    ]);
+
+    let column_labels = [
+        "          ".to_string(), // we want at least 10 spaces to accommodate "count[^2]"
+        format!("mean{}", if with_footnotes { "[^1]" } else { "" }),
+        "max".to_string(),
+        format!("count{}", if with_footnotes { "[^2]" } else { "" }),
+    ];
+    let counts: Vec<usize> = column_labels.iter().map(|s| s.chars().count()).collect();
+    for column in &column_labels {
+        write!(result, "| {} ", column).unwrap();
+    }
+    result.push_str("|\n");
+    for &count in &counts {
+        write!(result, "|:{}:", "-".repeat(count)).unwrap();
+    }
+    result.push_str("|\n");
+
+    let mut render_row = |row: Vec<String>| {
+        debug_assert_eq!(row.len(), column_labels.len());
+        for (column, &count) in row.into_iter().zip(&counts) {
+            write!(result, "| {:<1$} ", column, count).unwrap();
+        }
+        result.push_str("|\n");
+    };
+
+    for row in 0..5 {
+        let row_data = column_data
+            .iter()
+            .map(|rows| rows[row].clone())
+            .collect::<Vec<_>>();
+        render_row(row_data);
+    }
 }
 
 pub fn write_summary_table_footer(result: &mut String) {
     writeln!(
         result,
         r#"
-[^1]: *number of relevant changes*
-[^2]: *the arithmetic mean of the percent change*"#
+[^1]: *the arithmetic mean of the percent change*
+[^2]: *number of relevant changes*"#
     )
     .unwrap();
 }