compute-scottish-stv: --sort=alpha

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

diff --git a/compute-scottish-stv b/compute-scottish-stv
index 528cc5f0891a1556a26ed89c96547406122e1dba..81dc6adeafb10d553c50b2153a250a530bfc8966 100755 (executable)
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -58,6 +58,8 @@ $SIG{__DIE__} = sub {
     die $_[0];
 };
 
+sub total_history_cmp ();
+
 sub unkopt ($$) {
     my ($what,$opt) = @_;
     if ($opt =~ m/^[A-Z]/) {
@@ -67,6 +69,19 @@ sub unkopt ($$) {
     }
 }
 
+my $display_cmp = \&total_history_cmp;
+
+while (@ARGV && $ARGV[0] =~ m/^\-/) {
+    $_ = shift @ARGV;
+    if (m/^--$/) {
+       last;
+    } elsif (m/^--sort=alpha$/) {
+       $display_cmp = sub { $b->{Cand} cmp $a->{Cand} };
+    } else {
+       die;
+    }
+}
+
 for (;;) {
     $_ = <>;
     if (m/^\| /) {
@@ -198,7 +213,7 @@ sub countballots () {
        $c->{History}[$stage-1] = $c->{Total};
     }
 
-    foreach my $c (reverse sort total_history_cmp
+    foreach my $c (reverse sort $display_cmp
                   grep { !$_->{NonCont} } values %cands) {
        prf "candidate %-10s: %s votes\n", $c->{Cand}, sv $c->{Total};
     }
@@ -207,8 +222,8 @@ sub countballots () {
 sub computequota () {
     my $totalvalid = 0/1;
     $totalvalid += $_->{Total} foreach values %cands;
-    $quota = floor($totalvalid / (1 + $seats));
-    prf "quota %s\n", sv $quota;
+    $quota = floor($totalvalid / (1 + $seats) + 1);
+    prf "total valid %s quota %s\n", (sv $totalvalid), (sv $quota);
 }
 
 sub total_history_cmp () {
@@ -334,6 +349,8 @@ for (;;) {
            next;
        }
 
+       last if $seats_remain == 1; # don't bother doing more transfers
+
        my $B = $c->{Total};
        my %tspr;
 
@@ -354,7 +371,7 @@ for (;;) {
                die unless $tspr{"@$previously"} == $xfervalue;
            } else {
                $tspr{"@$previously"} = $xfervalue;
-               prf "transfer value of ballots %s: %s\n",
+               prf "transfer value of ballots %20s: %s\n",
                    "@$previously", sv $xfervalue;
            }
        }