commit 266b3bd635a37b28d6e92125c615d3e17f5022ea
author Ismael <ijimenezm@hotmail.es> Mon May 23 22:09:55 2016 +0200
committer Ismael <ijimenezm@hotmail.es> Mon May 23 22:09:55 2016 +0200
tree f5be9a3350b87a527d0ca8971d7d9e16d2b6c7b9
parent 43ef17441cc8767f5523031878a2f43ab1d7790b

changed color and remove iterations

src/console_reporter.cc

diff --git a/src/console_reporter.cc b/src/console_reporter.cc
index 09b91c2..242a94f 100644
--- a/src/console_reporter.cc
+++ b/src/console_reporter.cc
@@ -112,7 +112,7 @@
   const char* timeLabel;
   std::tie(timeLabel, multiplier) = GetTimeUnitAndMultiplier(result.time_unit);
 
-  ColorPrintf(COLOR_GREEN, "%-*s ",
+  ColorPrintf((result.report_big_o ||result.report_rms) ? COLOR_BLUE : COLOR_GREEN, "%-*s ",
               name_field_width_, result.benchmark_name.c_str());
 
   if(result.report_big_o) {
@@ -146,7 +146,8 @@
                 timeLabel);
   }
 
-  ColorPrintf(COLOR_CYAN, "%10lld", result.iterations);
+  if(!result.report_big_o && !result.report_rms)
+    ColorPrintf(COLOR_CYAN, "%10lld", result.iterations);
 
   if (!rate.empty()) {
     ColorPrintf(COLOR_DEFAULT, " %*s", 13, rate.c_str());

src/csv_reporter.cc

diff --git a/src/csv_reporter.cc b/src/csv_reporter.cc
index df662e4..9bfd66b 100644
--- a/src/csv_reporter.cc
+++ b/src/csv_reporter.cc
@@ -99,10 +99,20 @@
   ReplaceAll(&name, "\"", "\"\"");
   std::cout << "\"" << name << "\",";
 
-  std::cout << run.iterations << ",";
+  // Do not print iteration on bigO and RMS report
+  if(!run.report_big_o && !run.report_rms)
+    std::cout << run.iterations << ",";
+  else
+    std::cout << ",";
+    
   std::cout << real_time << ",";
   std::cout << cpu_time << ",";
-  std::cout << timeLabel << ",";
+  
+  // Do not print timeLabel on RMS report
+  if(!run.report_rms)
+    std::cout << timeLabel << ",";
+  else
+    std::cout << ",";
 
   if (run.bytes_per_second > 0.0) {
     std::cout << run.bytes_per_second;

src/json_reporter.cc

diff --git a/src/json_reporter.cc b/src/json_reporter.cc
index bfa85e4..c9d9cf1 100644
--- a/src/json_reporter.cc
+++ b/src/json_reporter.cc
@@ -162,17 +162,20 @@
     out << indent
         << FormatKV("name", run.benchmark_name)
         << ",\n";
-    out << indent
-        << FormatKV("iterations", run.iterations)
-        << ",\n";
+    if(!run.report_big_o && !run.report_rms) {
+        out << indent
+            << FormatKV("iterations", run.iterations)
+            << ",\n";
+    }
     out << indent
         << FormatKV("real_time", RoundDouble(real_time))
         << ",\n";
     out << indent
-        << FormatKV("cpu_time", RoundDouble(cpu_time))
-        << ",\n";
-    out << indent
-        << FormatKV("time_unit", timeLabel);
+        << FormatKV("cpu_time", RoundDouble(cpu_time));
+    if(!run.report_rms) {
+        out << ",\n" << indent
+            << FormatKV("time_unit", timeLabel);
+    }
     if (run.bytes_per_second > 0.0) {
         out << ",\n" << indent
             << FormatKV("bytes_per_second", RoundDouble(run.bytes_per_second));