Fix styles and more

This commit is contained in:
kojix2 2020-07-30 16:33:08 +09:00
parent 5f979d2e85
commit eabc36b581

View File

@ -12,8 +12,8 @@ module Uplot
parse_options(argv) parse_options(argv)
end end
def opt_new def create_parser
opt = OptionParser.new do |opt| OptionParser.new do |opt|
opt.on('-o', '--output', TrueClass) { |v| @output = v } opt.on('-o', '--output', TrueClass) { |v| @output = v }
opt.on('-d', '--delimiter VAL', String) { |v| @delimiter = v } opt.on('-d', '--delimiter VAL', String) { |v| @delimiter = v }
opt.on('-H', '--headers', TrueClass) { |v| @headers = v } opt.on('-H', '--headers', TrueClass) { |v| @headers = v }
@ -28,17 +28,16 @@ module Uplot
end end
def parse_options(argv) def parse_options(argv)
main_parser = opt_new main_parser = create_parser
parsers = {} parsers = Hash.new { |h, k| h[k] = create_parser }
parsers['hist'] = opt_new.on('--nbins VAL', Numeric) { |v| @params[:nbins] = v } parsers['hist'] .on('--nbins VAL', Numeric) { |v| @params[:nbins] = v }
parsers['histogram'] = parsers['hist'] parsers['histogram'] = parsers['hist']
parsers['line'] = opt_new
parsers['lineplot'] = parsers['line'] parsers['lineplot'] = parsers['line']
parsers['lines'] = opt_new parsers['lineplots'] = parsers['lines']
parsers['scatter'] = opt_new
parsers['scatterplot'] = parsers['scatter'] parsers['scatterplot'] = parsers['scatter']
parsers['bar'] = opt_new
parsers['barplot'] = parsers['bar'] parsers['barplot'] = parsers['bar']
parsers['boxplot'] = parsers['box']
parsers.default = nil
main_parser.banner = <<~MSG main_parser.banner = <<~MSG
Usage:\tuplot <command> [options] Usage:\tuplot <command> [options]
@ -71,6 +70,8 @@ module Uplot
scatter(data, headers) scatter(data, headers)
when 'bar', 'barplot' when 'bar', 'barplot'
barplot(data, headers) barplot(data, headers)
when 'box', 'boxplot'
boxplot(data, headers)
end.render($stderr) end.render($stderr)
print input if @output print input if @output
@ -134,5 +135,15 @@ module Uplot
end end
plot plot
end end
def boxplot(data, headers)
headers ||= (1..data.size).to_a
data.map! { |series| series.map(&:to_f) }
plot = UnicodePlot.boxplot(headers[0], data[0], **@params.compact)
1.upto(data.size - 1) do |i|
UnicodePlot.boxplot!(plot, headers[i], data[i])
end
plot
end
end end
end end