fix for bug numbers + skeleton for the find cov opper function, which hasn't been...

[ndwebbie.git] / ND / Include.pm

diff --git a/ND/Include.pm b/ND/Include.pm
index b5bf757dc15a1169251ac45f953a485b31588152..9a42d97b092f062599c628e7e72e7257bbde2de3 100644 (file)
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -51,9 +51,10 @@ sub parseValue {
 
 sub prettyValue {
        my ($value,$decimals) = @_;
+       return sprintf('%.3e',$value) if $value > 1000000000000000;
        my $unit = '';
        my @units = ('k','M','G','T');
-       for (my $i = 0; $value >= 1000;$i++){
+       for (my $i = 0; $value >= 1000 && $i < 4;$i++){
                $value /= 1000;
                $unit = $units[$i];
        }
@@ -83,8 +84,7 @@ sub intel_log {
 
 sub pa_xp {
        my ($roids,$ascore,$avalue,$tscore,$tvalue) = @_;
-       print "@_";
-       my $bravery = (min(2,$tscore/$ascore)-0.6) * (min(2,$tvalue/$avalue)-0.4);
+       my $bravery = (max(0,min(2,$tscore/$ascore)-0.6)) * (min(2,$tvalue/$avalue)-0.4);
        return int(max($roids * 10 * $bravery,0))
 
 }