COPYING: provide a licence

[appendix-a6.git] / compute-scottish-stv

diff --git a/compute-scottish-stv b/compute-scottish-stv
index 40a6667e4322b109be33a666c78eaf4524f5cdb9..98ec3082bd92de269a79af720f4ba8472c8f163a 100755 (executable)
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -207,6 +207,9 @@ sub prf {
     my $fmt = shift;
     printf " ".$fmt, @_;
 }
+sub prfm {
+    prf @_ unless $for_compare;
+}
 
 sub countballots () {
     my @pr;
@@ -220,6 +223,12 @@ sub countballots () {
        push @pr, $c;
     }
 
+    if ($for_compare) {
+       # for comparison with OpenSTV, which always prints
+       # the quota for every elected candidate
+       push @pr, { %$_, Total => $quota } foreach @elected;
+    }
+
     foreach my $c (reverse sort $display_cmp @pr) {
        prf "candidate %-10s: %s votes\n", $c->{Cand}, sv $c->{Total};
     }
@@ -229,8 +238,8 @@ sub computequota () {
     my $totalvalid = 0/1;
     $totalvalid += $_->{Total} foreach values %cands;
     $quota = floor($totalvalid / (1 + $seats) + 1);
-    prf "total valid %s\n", sv $totalvalid;
-    prf "quota       %s\n", sv $quota;
+    prfm "total valid %s\n", sv $totalvalid;
+    prf  "quota       %s\n", sv $quota;
 }
 
 sub total_history_cmp () {
@@ -301,7 +310,7 @@ sub select_best_worst ($$$$) {
            $selectcand, "@all";
     } else {
        $selectcand = $maybe[0]{Cand};
-       prf "$what %s\n", $selectcand;
+       prfm "$what %s\n", $selectcand;
     }
 
     return $cands{$selectcand};
@@ -309,7 +318,7 @@ sub select_best_worst ($$$$) {
 
 sub elect_core ($) {
     my ($c) = @_;
-    prf "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
+    prfm "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
     $c->{NonCont} = 'Elected';
     push @elected, $c;
 }
@@ -324,7 +333,7 @@ for (;;) {
 
     my $seats_remain = $seats - @elected;
 
-    prf "seats remaining %d\n", $seats_remain;
+    prfm "seats remaining %d\n", $seats_remain;
 
     last unless $seats_remain;
 
@@ -380,7 +389,7 @@ for (;;) {
                die unless $tspr{"@$previously"} == $xfervalue;
            } else {
                $tspr{"@$previously"} = $xfervalue;
-               prf "transfer value of ballots %20s: %s\n",
+               prfm "transfer value of ballots %20s: %s\n",
                    "@$previously", sv $xfervalue;
            }
        }
@@ -397,7 +406,7 @@ for (;;) {
        -1, 'eliminating';
 
     if ($c) {
-       prf "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
+       prfm "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
        $c->{NonCont} = 'Eliminated';
 
        sortballots @{ $c->{Votes} };