zhangyiss/YouPlot
1
0
Fork 0
mirror of https://github.com/red-data-tools/YouPlot.git synced 2025-06-24 18:11:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved parser

Browse Source
This commit is contained in:
kojix2 2020-07-30 11:08:36 +09:00
parent 958ce45635
commit cb43796e3f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/uplot/command.rb
View File

@ -7,7 +7,11 @@ module Uplot
end end
def parse_options(argv) def parse_options(argv)
parser = OptionParser.new parser = OptionParser.new.tap do |opt|
opt.on('-p', '--print') { |v| @print = v }
opt.on('--width VAL') { |v| @params[:width] = v.to_i }
opt.on('--height VAL') { |v| @params[:height] = v.to_i }
end
parser.order!(argv) parser.order!(argv)
@ptype = argv.shift @ptype = argv.shift
@ -18,19 +22,14 @@ module Uplot
subparsers['hist'] = OptionParser.new.tap do |sub| subparsers['hist'] = OptionParser.new.tap do |sub|
sub.on('--nbins VAL') { |v| @params[:nbins] = v.to_i } sub.on('--nbins VAL') { |v| @params[:nbins] = v.to_i }
sub.on('-p') { |v| @params[:p] = v }
end end
subparsers['histogram'] = subparsers['hist'] subparsers['histogram'] = subparsers['hist']
subparsers['line'] = OptionParser.new.tap do |sub| subparsers['line'] = OptionParser.new.tap do |sub|
sub.on('--width VAL') { |v| @params[:width] = v.to_i }
sub.on('--height VAL') { |v| @params[:height] = v.to_i }
end end
subparsers['lineplot'] = subparsers['line'] subparsers['lineplot'] = subparsers['line']
subparsers['lines'] = OptionParser.new.tap do |sub| subparsers['lines'] = OptionParser.new.tap do |sub|
sub.on('--width VAL') { |v| @params[:width] = v.to_i }
sub.on('--height VAL') { |v| @params[:height] = v.to_i }
end end
subparsers[@ptype].parse!(argv) unless argv.empty? subparsers[@ptype].parse!(argv) unless argv.empty?
@ -49,13 +48,13 @@ module Uplot
lines(input_lines) lines(input_lines)
end.render($stderr) end.render($stderr)
print input if @params[:p] print input if @print
end end
end end
def histogram(input_lines) def histogram(input_lines)
series = input_lines.map(&:to_f) series = input_lines.map(&:to_f)
UnicodePlot.histogram(series, nbins: @params[:nbins]) UnicodePlot.histogram(series, **@params.compact)
end end
def line(input_lines) def line(input_lines)
@ -64,8 +63,7 @@ module Uplot
input_lines.each_with_index do |l, i| input_lines.each_with_index do |l, i|
x[i], y[i] = l.split("\t")[0..1].map(&:to_f) x[i], y[i] = l.split("\t")[0..1].map(&:to_f)
end end
UnicodePlot.lineplot(x, y, **@params.compact)
UnicodePlot.lineplot(x, y, width: @params[:width], height: @params[:height])
end end
def lines(input_lines) def lines(input_lines)
@ -76,9 +74,7 @@ module Uplot
cols[j][i] = v.to_f cols[j][i] = v.to_f
end end
end end
require 'numo/narray' plot = UnicodePlot.lineplot(cols[0], cols[1], **@params.compact)
pp Numo::DFloat.cast(cols)
plot = UnicodePlot.lineplot(cols[0], cols[1], width: @params[:width], height: @params[:height])
2.upto(n_cols - 1) do |i| 2.upto(n_cols - 1) do |i|
UnicodePlot.lineplot!(plot, cols[0], cols[i]) UnicodePlot.lineplot!(plot, cols[0], cols[i])
end end