browser: calculate score multiplier from usage totals

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index c24df9e70d7952b8d6fae4320a2a9e7cfe616e59..421d9eff7aaa0d1a930c173b2cac2628282970d2 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -193,11 +193,11 @@ $canihas ||= {
        } @browsers
 }; # fallback hash based on release semantics
 
-my $usagepct = 1;  # score multiplier for 0..100 result
-# normalise usage percentage to only include shown browsers
-$usagepct = 100.01 / featurescore({  # yes for every possible version
-       map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
-});
+# score multiplier for percentage of all browser versions
+my $usagepct = 99.99 / sum(
+       map { $_->{-total} // values %{$_} } values %{$canihas}
+);
+
 $_->{usage} = featurescore($_->{stats}) * $usagepct
        for values %{ $caniuse->{data} };
 
@@ -232,15 +232,15 @@ print '<thead>', $header;
 # preceding row without any colspan to work around gecko bug
 print "\n<tr>";
 for my $browser (@browsers) {
-       for (@{ $versions{$browser} }) {
+       for my $span (@{ $versions{$browser} }) {
                my $lastver = first {
                        !defined $caniuse->{agents}->{$browser}->{verrelease}->{$_} # stable
-               } reverse @{$_};
+               } reverse @{$span};
                printf('<td title="%s"%s>%s',
                        join(' ',
-                               sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct),
-                               'version ' . showversions(@{$_}, undef),
-                               $_->[-1] eq $lastver ? () : '(development)',
+                               sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{ @{$span} }) * $usagepct),
+                               'version ' . showversions(@{$span}, undef),
+                               $span->[-1] eq $lastver ? () : '(development)',
                        ),
                        !defined $lastver && ' class="ex"',
                        showversions($lastver),