compute-scottish-stv: make --for-compare list winners too

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

diff --git a/compute-scottish-stv b/compute-scottish-stv
index a7fb3780d96113ab1e8921d57a2e1d60d92d7688..43d3a7286f3158f8a09277aa6ca60042e9b96274 100755 (executable)
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -70,6 +70,7 @@ sub unkopt ($$) {
 }
 
 my $display_cmp = \&total_history_cmp;
+my $for_compare = 0;
 
 while (@ARGV && $ARGV[0] =~ m/^\-/) {
     $_ = shift @ARGV;
@@ -77,6 +78,9 @@ while (@ARGV && $ARGV[0] =~ m/^\-/) {
        last;
     } elsif (m/^--sort=alpha$/) {
        $display_cmp = sub { $b->{Cand} cmp $a->{Cand} };
+    } elsif (m/^--for-compare$/) {
+       $for_compare = 1;
+       unshift @ARGV, '--sort=alpha';
     } else {
        die;
     }
@@ -205,16 +209,24 @@ sub prf {
 }
 
 sub countballots () {
+    my @pr;
+
     foreach my $c (values %cands) {
        next if $c->{NonCont};
        $c->{Total} = 0/1;
        $c->{Total} += $_->{Weight} foreach @{ $c->{Votes} };
        print DEBUG "counted $c->{Cand} $c->{Total}\n";
        $c->{History}[$stage-1] = $c->{Total};
+       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
-                  grep { !$_->{NonCont} } values %cands) {
+    foreach my $c (reverse sort $display_cmp @pr) {
        prf "candidate %-10s: %s votes\n", $c->{Cand}, sv $c->{Total};
     }
 }
@@ -327,6 +339,7 @@ for (;;) {
            prf "electing %s to fill remaining place(s)\n", $c->{Cand};
            elect_core $c;
        }
+       countballots() if $for_compare;
        last;
     }
 
@@ -402,9 +415,15 @@ for (;;) {
 
 print "Winners:\n"; 
 
-foreach my $i (0..$#elected) {
-    my $c = $elected[$i];
-    printf " %3d. %-10s %s\n", $i+1, $c->{Cand}, $c->{Desc};
+if ($for_compare) {
+    foreach my $c (sort { $a->{Cand} cmp $b->{Cand} } @elected) {
+       printf "  %s\n", $c->{Cand};
+    }
+} else {
+    foreach my $i (0..$#elected) {
+       my $c = $elected[$i];
+       printf " %3d. %-10s %s\n", $i+1, $c->{Cand}, $c->{Desc};
+    }
 }
 
 print "done.\n";