From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Aug 2016 20:12:19 +0000 (+0100)
Subject: compute-scottish-stv: wip adjust stage 1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=4cd1697174e964f23d0ad06faaa2bcd24288d174;p=appendix-a6.git

compute-scottish-stv: wip adjust stage 1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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 },