X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=appendix-a6.git;a=blobdiff_plain;f=compute-scottish-stv;h=40a6667e4322b109be33a666c78eaf4524f5cdb9;hp=81dc6adeafb10d553c50b2153a250a530bfc8966;hb=74893eb17a71ef9a0626be1237d1a5c5b84bcadb;hpb=5b395082d4e913cd3049505065af086380c0016c

diff --git a/compute-scottish-stv b/compute-scottish-stv
index 81dc6ad..40a6667 100755
--- 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;
     }
@@ -201,20 +205,22 @@ sub sv ($) {
 
 sub prf {
     my $fmt = shift;
-    printf "stage %d: ".$fmt, $stage, @_;
+    printf " ".$fmt, @_;
 }
 
 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;
     }
 
-    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};
     }
 }
@@ -223,7 +229,8 @@ sub computequota () {
     my $totalvalid = 0/1;
     $totalvalid += $_->{Total} foreach values %cands;
     $quota = floor($totalvalid / (1 + $seats) + 1);
-    prf "total valid %s quota %s\n", (sv $totalvalid), (sv $quota);
+    prf "total valid %s\n", sv $totalvalid;
+    prf "quota       %s\n", sv $quota;
 }
 
 sub total_history_cmp () {
@@ -311,6 +318,7 @@ $stage = 0;
 
 for (;;) {
     $stage++;
+    printf "stage %3d:\n", $stage;
 
     sortballots @allvotes if $stage == 1;
 
@@ -325,6 +333,7 @@ for (;;) {
 	    prf "electing %s to fill remaining place(s)\n", $c->{Cand};
 	    elect_core $c;
 	}
+	countballots() if $for_compare;
 	last;
     }
 
@@ -400,9 +409,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";