normal2openstvtxt: produces something that openstv accepts; need to check

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

diff --git a/compute-scottish-stv b/compute-scottish-stv
index e09f1ebcefb4430d7b8299afa0c27b8dcbd4d3e5..47604073388b5a14acc81a847ea9142e2ca05a2b 100755 (executable)
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -31,6 +31,7 @@ our %cands;
 our $stage=0;
 our $quota;
 our %tie;
+our @elected;
 
 our $DIGS = 5;
 our $F = (new Math::BigRat 10)->bpow($DIGS);
@@ -206,8 +207,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 () {
@@ -288,6 +289,7 @@ sub elect_core ($) {
     my ($c) = @_;
     prf "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
     $c->{NonCont} = 'Elected';
+    push @elected, $c;
 }
 
 $stage = 0;
@@ -297,8 +299,12 @@ for (;;) {
 
     sortballots @allvotes if $stage == 1;
 
-    my $seats_remain = $seats
-       - grep { ($_->{NonCont} // '') eq 'Elected' } values %cands;
+    my $seats_remain = $seats - @elected;
+
+    prf "seats remaining %d\n", $seats_remain;
+
+    last unless $seats_remain;
+
     if (continuing() <= $seats_remain) {
        foreach my $c (continuing()) {
            prf "electing %s to fill remaining place(s)\n", $c->{Cand};
@@ -328,6 +334,8 @@ for (;;) {
            next;
        }
 
+       last if $seats_remain == 1; # don't bother doing more transfers
+
        my $B = $c->{Total};
        my %tspr;
 
@@ -348,7 +356,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;
            }
        }
@@ -375,4 +383,11 @@ for (;;) {
     die;
 }
 
-print "done.\n"; 
+print "Winners:\n"; 
+
+foreach my $i (0..$#elected) {
+    my $c = $elected[$i];
+    printf " %3d. %-10s %s\n", $i+1, $c->{Cand}, $c->{Desc};
+}
+
+print "done.\n";