X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/30fb51a784dd9314c6776f18b7189b197be12df3..ca6b20aa1d3f9ca870d0a26a802b9a263218ea79:/barcat diff --git a/barcat b/barcat index 268c993..15a2269 100755 --- a/barcat +++ b/barcat @@ -33,6 +33,8 @@ GetOptions(\%opt, 'value-length=i', 'hidemin=i', 'hidemax=i', + 'minval=f', + 'maxval=f', 'limit|L=s' => sub { my ($optname, $optval) = @_; $optval ||= 0; @@ -50,6 +52,9 @@ GetOptions(\%opt, 'spark:s' => sub { $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█']; }, + 'palette:s' => sub { + $opt{palette} = [ split /\s/, $_[1] ]; + }, 'stat|s!', 'signal-stat=s', 'unmodified|u!', @@ -91,6 +96,8 @@ $opt{anchor} //= qr/\A/; $opt{'value-length'} = 6 if $opt{units}; $opt{'value-length'} = 1 if $opt{unmodified}; $opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT'; +$opt{markers} //= '=avg >31.73v <68.27v +50v |0'; +$opt{palette} //= $opt{color} && [31, 90, 32]; my (@lines, @values, @order); @@ -148,8 +155,8 @@ state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0; @lines > $nr or return unless $opt{hidemin}; @order = sort { $b <=> $a } @order unless tied @order; -my $maxval = ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0; -my $minval = min $order[-1] // (), 0; +my $maxval = $opt{maxval} // ($opt{hidemax} ? max grep { length } @values[0 .. $opt{hidemax} - 1] : $order[0]) // 0; +my $minval = $opt{minval} // min $order[-1] // (), 0; my $lenval = $opt{'value-length'} // max map { length } @order; my $len = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 : max map { length $values[$_] && length $lines[$_] } @@ -158,14 +165,24 @@ my $size = ($maxval - $minval) && ($opt{width} - $lenval - $len) / ($maxval - $minval); # bar multiplication my @barmark; -if ($opt{markers} // 1 and $size > 0) { - my sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size } - $barmark[ (sum(@order) / @order - $minval) * $size ] = '='; # average - $barmark[ orderpos($#order * .31731) ] = '>'; - $barmark[ orderpos($#order * .68269) ] = '<'; - $barmark[ orderpos($#order / 2) ] = '+'; # mean - $barmark[ -$minval * $size ] = '|' if $minval < 0; # zero - color(36) for @barmark; +if ($opt{markers} and $size > 0) { + for my $markspec (split /\h/, $opt{markers}) { + my ($char, $func) = split //, $markspec, 2; + my $pos = eval { + if ($func eq 'avg') { + return sum(@order) / @order; + } + elsif ($func =~ /\A([0-9.]+)v\z/) { + my $index = $#order * $1 / 100; + return ($order[$index] + $order[$index + .5]) / 2; + } + else { + return $func; + } + } - $minval; + $pos >= 0 or next; + color(36) for $barmark[$pos * $size] = $char; + } state $lastmax = $maxval; if ($maxval > $lastmax) { @@ -193,22 +210,30 @@ sub sival { ); } -say sprintf '%*s-+%*s-+', $lenval, $minval, $size * ($maxval - $minval) - 3, $maxval if $opt{header}; +say( + color(31), sprintf('%*s', $lenval, $minval), + color(90), '-', color(36), '+', + color(32), sprintf('%*s', $size * ($maxval - $minval) - 3, $maxval), + color(90), '-', color(36), '+', + color(0), +) if $opt{header}; while ($nr <= $#lines) { $nr >= $opt{hidemax} and last if defined $opt{hidemax}; my $val = $values[$nr]; + my $rel = length $val && ($val - $minval) / ($maxval - $minval); if ($opt{spark}) { - print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ]; + print color($opt{palette}->[ $rel * $#{$opt{palette}} ]) if $opt{palette}; + print $opt{spark}->[ $rel * $#{$opt{spark}} ]; next; } if (length $val) { - my $color = !$opt{color} ? undef : - $val == $order[0] ? 32 : # max - $val == $order[-1] ? 31 : # min - 90; + my $color = !$opt{palette} ? undef : + $val == $order[0] ? $opt{palette}->[-1] : # max + $val == $order[-1] ? $opt{palette}->[0] : # min + $opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ]; $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val; color($color) for $val; } @@ -220,7 +245,7 @@ while ($nr <= $#lines) { continue { $nr++; } -say '' if $opt{spark}; +say $opt{palette} ? color(0) : '' if $opt{spark}; } @@ -334,38 +359,52 @@ but disregarded for padding and bar size. Glyph to repeat for the graph line. Defaults to a dash C<->. -=item -m, --markers= +=item -m, --markers= Statistical positions to indicate on bars. -Cannot be customized yet, -only disabled by providing an empty argument. - -Any value enables all marker characters: +A single indicator glyph precedes each position: =over 2 -=item B<=> +=item -Average: -the sum of all values divided by the number of counted lines. +Exact value to match on the axis. +A vertical bar at the zero crossing is displayed by I<|0> +for negative values. +For example I<:3.14> would show a colon at pi. -=item B<+> +=item I -Mean, median: +Ranked value at the given percentile. +The default shows I<+> at I<50v> for the mean or median; the middle value or average between middle values. +One standard deviation right of the mean is at about I<68.3v>. +The default includes I<< >31.73v <68.27v >> +to encompass all I results, or 68% of all entries, by B<< <--> >>. + +=item I -=item B<<> +Matches the average; +the sum of all values divided by the number of counted lines. +Indicated by default as I<=>. -Standard deviation left of the mean. -Only 16% of all values are lower. +=back -=item B<< > >> +=item --min=, --max= -Standard deviation right of the mean. -The part between B<< <--> >> encompass all I results, -or 68% of all entries. +Bars extend from 0 or the minimum value if lower, +to the largest value encountered. +These options can be set to customize this range. -=back +=item --palette=... + +Override colors of parsed numbers. +Can be any CSI escape, such as I<90> for default dark grey, +or alternatively I<1;30> for bold black. + +In case of additional colors, +the last is used for values equal to the maximum, the first for minima. +If unspecified, these are green and red respectively (I<31 90 32>). =item --spark[=]