summaryrefslogtreecommitdiff
path: root/benchmark
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-05 02:39:09 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-05 02:39:09 (GMT)
commite5eb9a16dff5ab5efd838726cfd1ca89fbe68b4f (patch)
treeb37d10daa4d7a3b7e71438ec211d511fd12f395b /benchmark
parentd816b8e4e67a65125172c0d1d351156b2910cf13 (diff)
driver.rb: plain text table
* benchmark/driver.rb (show_results): support plain text style table format output. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'benchmark')
-rw-r--r--benchmark/driver.rb36
1 files changed, 24 insertions, 12 deletions
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 3350f65..c9fec00 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -121,10 +121,23 @@ class BenchmarkDriver
def show_results
case @opt[:format]
when :tsv
+ strformat = "\t%1$s"
+ numformat = "\t%1$*2$.3f"
+ minwidth = 0
+ name_width = 0
when :markdown
markdown = true
+ strformat = "|%1$-*2$s"
+ numformat = "|%1$*2$.3f"
+ when :plain
+ strformat = " %1$-*2$s"
+ numformat = " %1$*2$.3f"
end
+ name_width ||= @name_width
+ minwidth ||= 7
+ width = @execs.map{|(_, v)| [v.size, minwidth].max}
+
output
if @verbose
@@ -151,28 +164,26 @@ class BenchmarkDriver
output "minimum results in each #{@repeat} measurements."
end
- tabs = @name_width / 8
- sep = markdown ? "\t|" : "\t"
output "Execution time (sec)"
output if markdown
- output ["name", @execs.map{|(_, v)| v}].join(sep)
- output "-"*(8*tabs+8)+"|------:"*@execs.size if markdown
- @results.each{|v, result|
+ output ["name".ljust(name_width), @execs.map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
+ output ["-"*name_width, width.map{|n|":".rjust(n, "-")}].join("|") if markdown
+ @results.each_with_index{|(v, result), i|
rets = []
s = adjusted_results(v, result){|r|
- rets << sprintf("%.3f", r)
+ rets << sprintf(numformat, r, width[i])
}
v += s if s
- output [v, rets].join(sep)
+ output [v.ljust(name_width), rets].join("")
}
if @execs.size > 1
output
output "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)"
output if markdown
- output ["name", @execs[1..-1].map{|(_, v)| v}].join(sep)
- output "-"*(8*tabs+8)+"|------:"*(@execs.size-1) if markdown
- @results.each{|v, result|
+ output ["name".ljust(name_width), @execs[1..-1].map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
+ output ["-"*name_width, width[1..-1].map{|n|":".rjust(n, "-")}].join("|") if markdown
+ @results.each_with_index{|(v, result), i|
rets = []
first_value = nil
s = adjusted_results(v, result){|r|
@@ -180,14 +191,14 @@ class BenchmarkDriver
if r == 0
rets << "Error"
else
- rets << sprintf("%.3f", first_value/r)
+ rets << sprintf(numformat, first_value/r, width[i])
end
else
first_value = r
end
}
v += s if s
- output [v, rets].join(sep)
+ output [v.ljust(name_width), rets].join("")
}
end
@@ -297,6 +308,7 @@ if __FILE__ == $0
formats = {
:tsv => ".tsv",
:markdown => ".md",
+ :plain => ".txt",
}
parser = OptionParser.new{|o|