'value-length=i',
'hidemin=i',
'hidemax=i',
- 'limit|L=s' => sub {
+ 'minval=f',
+ 'maxval=f',
+ 'limit|L:s' => sub {
my ($optname, $optval) = @_;
$optval ||= 0;
($opt{hidemin}, $opt{hidemax}) =
$opt{'graph-format'} = substr $_[1], 0, 1;
},
'spark:s' => sub {
- $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
+ $opt{spark} = [split //, $_[1] || ' ▁▂▃▄▅▆▇█'];
},
- 'palette:s' => sub {
- $opt{palette} = [ split /\s/, $_[1] ];
+ 'palette=s' => sub {
+ $opt{palette} = {
+ fire => [qw( 90 31 91 33 93 97 96 )],
+ fire88 => [map {"38;5;$_"} qw(
+ 80 32 48 64 68 72 76 77 78 79 47
+ )],
+ fire256=> [map {"38;5;$_"} qw(
+ 235 52 88 124 160 196
+ 202 208 214 220 226 227 228 229 230 231 159
+ )],
+ ramp88 => [map {"38;5;$_"} qw(
+ 64 65 66 67 51 35 39 23 22 26 25 28
+ )],
+ whites => [qw( 1;30 0;37 1;37 )],
+ greys => [map {"38;5;$_"} 52, 235..255, 47],
+ }->{$_[1]} // [ split /[^0-9;]/, $_[1] ];
},
'stat|s!',
'signal-stat=s',
},
) or exit 64; # EX_USAGE
-$opt{width} ||= $ENV{COLUMNS} || 80;
+$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80;
$opt{color} //= -t *STDOUT; # enable on tty
$opt{'graph-format'} //= '-';
$opt{trim} *= $opt{width} / 100 if $opt{trimpct};
$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);
@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[$_] }
($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) {
while ($nr <= $#lines) {
$nr >= $opt{hidemax} and last if defined $opt{hidemax};
my $val = $values[$nr];
+ my $rel = length $val && ($val - $minval) / ($maxval - $minval);
+ my $color = !length $val || !$opt{palette} ? undef :
+ $val == $order[0] ? $opt{palette}->[-1] : # max
+ $val == $order[-1] ? $opt{palette}->[0] : # min
+ $opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];
if ($opt{spark}) {
- print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ];
+ print color($color), $opt{spark}->[
+ !$val ? 0 : # blank
+ $val == $order[0] ? -1 : # max
+ $val == $order[-1] ? 1 : # min
+ $#{$opt{spark}} < 3 ? 1 :
+ $rel * ($#{$opt{spark}} - 3) + 2.5
+ ];
next;
}
if (length $val) {
- my $color = !$opt{palette} ? undef :
- $val == $order[0] ? $opt{palette}->[-1] : # max
- $val == $order[-1] ? $opt{palette}->[0] : # min
- $opt{palette}->[1] // $opt{palette}->[0];
$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
color($color) for $val;
}
continue {
$nr++;
}
-say '' if $opt{spark};
+say $opt{palette} ? color(0) : '' if $opt{spark};
}
Prepend a dash (i.e. make negative) to enforce padding
regardless of encountered contents.
-=item -L, --limit=(<count>|<start>-[<end>])
+=item -L, --limit[=(<count> | <start>-[<end>])]
Stop output after a number of lines.
All input is still counted and analyzed for statistics,
Glyph to repeat for the graph line.
Defaults to a dash C<->.
-=item -m, --markers=
+=item -m, --markers=<format>
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 <number>
-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 <percentage>I<v>
-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<normal> results, or 68% of all entries, by B<< <--> >>.
-=item B<<>
+=item I<avg>
-Standard deviation left of the mean.
-Only 16% of all values are lower.
+Matches the average;
+the sum of all values divided by the number of counted lines.
+Indicated by default as I<=>.
-=item B<< > >>
+=back
-Standard deviation right of the mean.
-The part between B<< <--> >> encompass all I<normal> results,
-or 68% of all entries.
+=item --min=<number>, --max=<number>
-=back
+Bars extend from 0 or the minimum value if lower,
+to the largest value encountered.
+These options can be set to customize this range.
-=item --palette=<color>...
+=item --palette=(<preset> | <color>...)
Override colors of parsed numbers.
Can be any CSI escape, such as I<90> for default dark grey,
git.shiar.nl / barcat.git / blobdiff