Minor fixes

dotnet · Jan 17, 2016 · b0e1082 · b0e1082
1 parent 145b78f
commit b0e1082
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 29 deletions.
diff --git a/BenchmarkDotNet/BenchmarkDotNet.csproj b/BenchmarkDotNet/BenchmarkDotNet.csproj
@@ -54,6 +54,7 @@
     <Compile Include="BenchmarkState.cs" />
     <Compile Include="BenchmarkRunnerExtensions.cs" />
     <Compile Include="EnvironmentInfo.cs" />
+    <Compile Include="Extensions\StatSummaryExtensions.cs" />
     <Compile Include="Helpers\ResourceHelper.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Plugins\Exporters\BenchmarkCsvRunsExporter.cs" />

diff --git a/BenchmarkDotNet/Extensions/ReportExtensions.cs b/BenchmarkDotNet/Extensions/ReportExtensions.cs
@@ -26,6 +26,12 @@ public static IList<BenchmarkRunReport> GetRunsFor<T>(this IEnumerable<Benchmark
             return reports.GetReportFor<T>(actionExp).GetTargetRuns().ToList();
         }
 
-        public static StatSummary GetStats(this IEnumerable<BenchmarkRunReport> runReports) => new StatSummary(runReports.Select(r => r.GetAverageNanoseconds()));
+        public static StatSummary GetStats(this IList<BenchmarkRunReport> runs) =>
+            runs.Any()
+            ? new StatSummary(runs.Select(r => r.GetAverageNanoseconds()))
+            : null;
+
+        public static StatSummary GetStats(this IEnumerable<BenchmarkRunReport> runs) =>
+            GetStats(runs.ToList());
     }
 }
diff --git a/BenchmarkDotNet/Extensions/StatSummaryExtensions.cs b/BenchmarkDotNet/Extensions/StatSummaryExtensions.cs
@@ -0,0 +1,37 @@
+using System.Text;
+using BenchmarkDotNet.Common;
+using BenchmarkDotNet.Statistic;
+
+namespace BenchmarkDotNet.Extensions
+{
+    public static class StatSummaryExtensions
+    {
+        private static string NullSummaryMessage = "<Empty statistic (N=0)>";
+
+        public static string ToStr(this StatSummary s)
+        {
+            if (s == null)
+                return NullSummaryMessage;
+            var builder = new StringBuilder();
+            builder.AppendLine($"Mean = {s.Mean.ToStr()}, StdError = {s.StandardError.ToStr()} (N = {s.N}, StdDev = {s.StandardDeviation.ToStr()})");
+            builder.AppendLine($"Min = {s.Min.ToStr()}, Q1 = {s.Q1.ToStr()}, Median = {s.Median.ToStr()}, Q3 = {s.Q3.ToStr()}, Max = {s.Max.ToStr()}");
+            builder.AppendLine($"IQR = {s.InterquartileRange.ToStr()}, LowerFence = {s.LowerFence.ToStr()}, UpperFence = {s.UpperFence.ToStr()}");
+            builder.AppendLine($"ConfidenceInterval = {s.ConfidenceInterval.ToStr()}");
+            return builder.ToString();
+        }
+
+        public static string ToTimeStr(this StatSummary s, TimeUnit unit = null)
+        {
+            if (s == null)
+                return NullSummaryMessage;
+            if (unit == null)
+                unit = TimeUnit.GetBestTimeUnit(s.Mean);
+            var builder = new StringBuilder();
+            builder.AppendLine($"Mean = {s.Mean.ToTimeStr(unit)}, StdError = {s.StandardError.ToTimeStr(unit)} (N = {s.N}, StdDev = {s.StandardDeviation.ToTimeStr(unit)})");
+            builder.AppendLine($"Min = {s.Min.ToTimeStr(unit)}, Q1 = {s.Q1.ToTimeStr(unit)}, Median = {s.Median.ToTimeStr(unit)}, Q3 = {s.Q3.ToTimeStr(unit)}, Max = {s.Max.ToTimeStr(unit)}");
+            builder.AppendLine($"IQR = {s.InterquartileRange.ToTimeStr(unit)}, LowerFence = {s.LowerFence.ToTimeStr(unit)}, UpperFence = {s.UpperFence.ToTimeStr(unit)}");
+            builder.AppendLine($"ConfidenceInterval = {s.ConfidenceInterval.ToTimeStr(unit)}");
+            return builder.ToString();
+        }
+    }
+}
diff --git a/BenchmarkDotNet/Plugins/Exporters/BenchmarkExporterHelper.cs b/BenchmarkDotNet/Plugins/Exporters/BenchmarkExporterHelper.cs
@@ -92,8 +92,8 @@ public static class BenchmarkExporterHelper
 
                 if (showParams)
                     row.Add(item.Report.Parameters.IntParam.ToString());
-                row.Add(item.Stat.Mean.ToTimeStr(timeUnit));
-                row.Add(item.Stat.StandardError.ToTimeStr(timeUnit));
+                row.Add(pretty ? item.Stat.Mean.ToTimeStr(timeUnit) : item.Stat.Mean.ToStr());
+                row.Add(pretty ? item.Stat.StandardError.ToTimeStr(timeUnit) : item.Stat.StandardError.ToStr());
 
                 if (extraColumns != null)
                 {

diff --git a/BenchmarkDotNet/Plugins/Toolchains/Classic/BenchmarkClassicExecutor.cs b/BenchmarkDotNet/Plugins/Toolchains/Classic/BenchmarkClassicExecutor.cs
@@ -73,7 +73,7 @@ private BenchmarkExecResult ExecuteImpl(Process process, IBenchmarkDiagnoser dia
                     lines.Add(line);
 
                 // Wait until we know "Warmup" is happening, and then dissassemble the process
-                if (codeAlreadyExtracted == false && line.StartsWith("// Warmup") && !line.StartsWith("// Warmup (idle)"))
+                if (codeAlreadyExtracted == false && line.StartsWith("Warmup ") && !line.StartsWith("WarmupIdle "))
                 {
                     try
                     {

diff --git a/BenchmarkDotNet/Reports/BenchmarkReport.cs b/BenchmarkDotNet/Reports/BenchmarkReport.cs
@@ -27,7 +27,7 @@ public BenchmarkReport(Benchmark benchmark, IList<BenchmarkRunReport> runs, Envi
 
     public static class BenchmarkReportExtensions
     {
-        public static IEnumerable<BenchmarkRunReport> GetTargetRuns(this BenchmarkReport report) =>
-            report.Runs.Where(r => r.IterationMode == BenchmarkIterationMode.Target);
+        public static IList<BenchmarkRunReport> GetTargetRuns(this BenchmarkReport report) =>
+            report.Runs.Where(r => r.IterationMode == BenchmarkIterationMode.Target).ToList();
     }
 }
diff --git a/BenchmarkDotNet/Statistic/StatSummary.cs b/BenchmarkDotNet/Statistic/StatSummary.cs
@@ -24,7 +24,7 @@ public StatSummary(IEnumerable<double> values)
             var list = values.ToList();
             N = list.Count;
             if (N == 0)
-                throw new InvalidOperationException("Sequence contains no elements");
+                throw new InvalidOperationException("StatSummary: Sequence contains no elements");
             list.Sort();
 
             if (N == 1)
@@ -68,27 +68,5 @@ public StatSummary(IEnumerable<double> values)
         public double StandardError { get; }
         public double StandardDeviation { get; }
         public ConfidenceInterval ConfidenceInterval { get; }
-
-        public string ToStr()
-        {
-            var builder = new StringBuilder();
-            builder.AppendLine($"Mean = {Mean.ToStr()}, StdError = {StandardError.ToStr()} (N = {N}, StdDev = {StandardDeviation.ToStr()})");
-            builder.AppendLine($"Min = {Min.ToStr()}, Q1 = {Q1.ToStr()}, Median = {Median.ToStr()}, Q3 = {Q3.ToStr()}, Max = {Max.ToStr()}");
-            builder.AppendLine($"IQR = {InterquartileRange.ToStr()}, LowerFence = {LowerFence.ToStr()}, UpperFence = {UpperFence.ToStr()}");
-            builder.AppendLine($"ConfidenceInterval = {ConfidenceInterval.ToStr()}");
-            return builder.ToString();
-        }
-
-        public string ToTimeStr(TimeUnit unit = null)
-        {
-            if (unit == null)
-                unit = TimeUnit.GetBestTimeUnit(Mean);
-            var builder = new StringBuilder();
-            builder.AppendLine($"Mean = {Mean.ToTimeStr(unit)}, StdError = {StandardError.ToTimeStr(unit)} (N = {N}, StdDev = {StandardDeviation.ToTimeStr(unit)})");
-            builder.AppendLine($"Min = {Min.ToTimeStr(unit)}, Q1 = {Q1.ToTimeStr(unit)}, Median = {Median.ToTimeStr(unit)}, Q3 = {Q3.ToTimeStr(unit)}, Max = {Max.ToTimeStr(unit)}");
-            builder.AppendLine($"IQR = {InterquartileRange.ToTimeStr(unit)}, LowerFence = {LowerFence.ToTimeStr(unit)}, UpperFence = {UpperFence.ToTimeStr(unit)}");
-            builder.AppendLine($"ConfidenceInterval = {ConfidenceInterval.ToTimeStr(unit)}");
-            return builder.ToString();
-        }
     }
 }