From 4cd1697174e964f23d0ad06faaa2bcd24288d174 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Aug 2016 21:12:19 +0100 Subject: [PATCH] compute-scottish-stv: wip adjust stage 1 Signed-off-by: Ian Jackson --- compute-scottish-stv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compute-scottish-stv b/compute-scottish-stv index 6fde103..575f10e 100755 --- a/compute-scottish-stv +++ b/compute-scottish-stv @@ -244,15 +244,13 @@ sub elect_core ($) { $c->{NonCont} = 'Elected'; } -$stage = 1; - -sortballots @allvotes; -countballots(); -computequota(); +$stage = 0; for (;;) { $stage++; + sortballots @allvotes if $stage == 1; + my $seats_remain = $seats - grep { ($_->{NonCont} // '') eq 'Elected' } values %cands; if (continuing() <= $seats_remain) { @@ -265,6 +263,8 @@ for (;;) { countballots(); + computequota if $stage == 1; + my $c = select_best_worst sub { $_->{Total} >= $quota }, sub { $_ > $quota }, -- 2.30.2