negative values less than positive

[barcat.git] / graph

diff --git a/graph b/graph
index 01f68463e0c8779f8d974b8d0dfe679673da9444..20ce299d1121162cbcfdd480da2975d8ddb398a4 100755 (executable)
--- a/graph
+++ b/graph
@@ -19,30 +19,36 @@ $opt{color} //= 1;
 
 my @lines = readline or exit;
 chomp for @lines;
-my @values = map { s/^\h*(-?[0-9]*)// and $1 } @lines;
-my @order  = sort { $b <=> $a } @values;
-my $maxval = max $order[0], -$order[-1];
-my $lenval = 1 + ($order[-1] < 0) + int log($maxval || 1) / log 10;  # max string length
+my @values = map { s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x and $1 } @lines;
+my @order  = sort { $b <=> $a } grep { length } @values;
+my $maxval = $order[0];
+my $minval = min $order[-1], 0;
+
+my $lenval = max map { length } @order;
 my $len    = 1 + max map { length } @lines;  # left padding
-my $size   = ($opt{width} - $lenval - $len) / $maxval;  # bar multiplication
+my $size   = ($maxval - $minval) &&
+       ($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
-sub orderpos { ($order[$_[0]] + $order[$_[0] + .5]) / 2 * $size }
+sub orderpos { (($order[$_[0]] + $order[$_[0] + .5]) / 2 - $minval) * $size }
 my @barmark;
-$barmark[ sum(@values) / @values * $size ] = '=';  # average
+$barmark[ (sum(@order) / @order - $minval) * $size ] = '=';  # average
 $barmark[ orderpos($#order / 2) ] = '+';  # mean
+$barmark[ -$minval * $size ] = '|' if $minval < 0;  # zero
 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 .. (($val || 0) - $minval) * $size;
        say '';
 }