commit 110f8ed9ff7df30e6ac86072d3353d164537ca78
author Alessio Balsini <balsini@google.com> Mon Oct 17 14:09:01 2022 +0100
committer Alessio Balsini <balsini@google.com> Tue Nov 22 14:59:17 2022 +0000
tree 52fb5859c6549ee9d04a81cca2115214e236dab6
parent 2c2b8796d087103fedaf950617acbf63dd9c93f3

Table printing: use std::setfill for section spacings

This change aims at improving the code readability by using the iomanip
functionalities to format the output, instead of manually creating
spacers with for loops.

Bug: 252808520
Test: dittobench --format report test/example/read_with_setup.ditto
Change-Id: I70f0b3f1b59ecfdf556d2c3b10920279581825a4
Signed-off-by: Alessio Balsini <balsini@google.com>

src/result.cpp

diff --git a/src/result.cpp b/src/result.cpp
index a31d3fc..702de49 100644
--- a/src/result.cpp
+++ b/src/result.cpp
@@ -84,7 +84,7 @@
 }
 
 void PrintTableBorder() {
-  for (int i = 0; i < kTableWidth; i++) std::cout << "-";
+  std::cout << std::setfill('-') << std::setw(kTableWidth) << "" << std::setfill(' ');
   std::cout << '\n';
 }
 
@@ -95,15 +95,15 @@
   std::cout << "| ";  // beginning of table row
   std::cout << std::setw(70) << std::left << "Instruction name";
   std::cout << kTableDivider;
-  std::cout << std::setw(15) << std::left << " Min";
+  std::cout << std::setw(15) << std::right << " Min";
   std::cout << kTableDivider;
-  std::cout << std::setw(15) << std::left << " Max";
+  std::cout << std::setw(15) << " Max";
   std::cout << kTableDivider;
-  std::cout << std::setw(15) << std::left << " Mean";
+  std::cout << std::setw(15) << " Mean";
   std::cout << kTableDivider;
-  std::cout << std::setw(15) << std::left << " Median";
+  std::cout << std::setw(15) << " Median";
   std::cout << kTableDivider;
-  std::cout << std::setw(15) << std::left << " SD";
+  std::cout << std::setw(15) << " SD";
   std::cout << kTableDivider;
   std::cout << '\n';
   PrintTableBorder();
@@ -186,7 +186,7 @@
     std::cout << "Bandwidth(" << bandwidth_unit_.name << ") |";
     std::cout << " Normalized number of bandwidth samples\n";
   }
-  for (int i = 0; i <= kMaxHistogramWidth + 15; i++) std::cout << "-";
+  std::cout << std::setfill('-') << std::setw(kMaxHistogramWidth) << "" << std::setfill(' ');
   std::cout << '\n';
 }
 
@@ -197,10 +197,13 @@
   for (unsigned int i = 0; i < freq_vector.size(); i++) {
     std::cout.width(kSampleDisplayWidth);
     std::cout << min_value + bin_size * i << kTableDivider;
-    for (int j = 0; j < freq_vector[i] * kMaxHistogramWidth / max_frequency; j++) std::cout << "x";
-    std::cout << " {" << freq_vector[i] << "}";
+
+    int hist_width = ceil(static_cast<double>(freq_vector[i]) * kMaxHistogramWidth / max_frequency);
+    std::cout << std::setfill('#') << std::setw(hist_width) << "" << std::setfill(' ');
+
+    std::cout << " { " << freq_vector[i] << " }\n";
+
     sum += freq_vector[i];
-    std::cout << '\n';
   }
 
   std::cout << '\n';
@@ -314,7 +317,7 @@
 }
 
 void PrintEmptyMeasurementInCsv(std::ostream& csv_stream) {
-  for (int i = 0; i < 5; i++) csv_stream << kCsvDelimiter;
+  csv_stream << std::setfill(kCsvDelimiter) << std::setw(5) << "" << std::setfill(' ');
 }
 
 // Recursive function to print one row at a time using the .csv stream given as a parameter