From 59b6a8e94928374df733f99989161309f568cb83 Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Wed, 4 Sep 2019 20:39:10 +0200 Subject: [PATCH] pass through numberless lines Ignore in statistics, and silence perl warnings about arguments not being numeric. --- graph | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/graph b/graph index 2212926..63544d0 100755 --- a/graph +++ b/graph @@ -20,7 +20,7 @@ $opt{color} //= 1; my @lines = readline or exit; chomp for @lines; my @values = map { s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x and $1 } @lines; -my @order = sort { $b <=> $a } @values; +my @order = sort { $b <=> $a } grep { length } @values; my $maxval = max $order[0], -$order[-1]; my $lenval = max map { length } @order; my $len = 1 + max map { length } @lines; # left padding @@ -28,21 +28,23 @@ my $size = $maxval && ($opt{width} - $lenval - $len) / $maxval; # bar multipl sub orderpos { ($order[$_[0]] + $order[$_[0] + .5]) / 2 * $size } my @barmark; -$barmark[ sum(@values) / @values * $size ] = '='; # average +$barmark[ sum(@order) / @order * $size ] = '='; # average $barmark[ orderpos($#order / 2) ] = '+'; # mean defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark; for my $nr (0 .. $#lines) { my $val = $values[$nr]; - my $color = !$opt{color} ? 0 : - $val == $order[0] ? 32 : # max - $val == $order[-1] ? 31 : # min - 90; - printf "\e[%sm", $color if $color; - printf "%*s", $lenval, $val; - print "\e[0m" if $color; + if (length $val) { + my $color = !$opt{color} ? 0 : + $val == $order[0] ? 32 : # max + $val == $order[-1] ? 31 : # min + 90; + printf "\e[%sm", $color if $color; + printf "%*s", $lenval, $val; + print "\e[0m" if $color; + } printf '%-*s', $len, $lines[$nr]; - print $barmark[$_] // '-' for 1 .. abs $val * $size; + print $barmark[$_] // '-' for 1 .. abs($val || 0) * $size; say ''; } -- 2.30.0