X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=compute-scottish-stv;h=98ec3082bd92de269a79af720f4ba8472c8f163a;hb=HEAD;hp=43d3a7286f3158f8a09277aa6ca60042e9b96274;hpb=57ed77b598efe9c02d160c2ca3cc55512eeb7f29;p=appendix-a6.git

diff --git a/compute-scottish-stv b/compute-scottish-stv
index 43d3a72..788cb32 100755
--- a/compute-scottish-stv
+++ b/compute-scottish-stv
@@ -95,7 +95,7 @@ for (;;) {
 	    } elsif (m/^_?[Tt]ie=(.*)\>(.*)$/) {
 		my @more = split /\,/, $1;
 		my @less = split /\,/, $2;
-		my @all = join ',', sort (@more, @less);
+		my @all = join ' ', sort (@more, @less);
 		$tie{"@all"}{Win}  = $more[0] if @more == 1;
 		$tie{"@all"}{Lose} = $less[0] if @less == 1;
 	    } else {
@@ -207,6 +207,9 @@ sub prf {
     my $fmt = shift;
     printf " ".$fmt, @_;
 }
+sub prfm {
+    prf @_ unless $for_compare;
+}
 
 sub countballots () {
     my @pr;
@@ -235,8 +238,8 @@ sub computequota () {
     my $totalvalid = 0/1;
     $totalvalid += $_->{Total} foreach values %cands;
     $quota = floor($totalvalid / (1 + $seats) + 1);
-    prf "total valid %s\n", sv $totalvalid;
-    prf "quota       %s\n", sv $quota;
+    prfm "total valid %s\n", sv $totalvalid;
+    prf  "quota       %s\n", sv $quota;
 }
 
 sub total_history_cmp () {
@@ -298,7 +301,7 @@ sub select_best_worst ($$$$) {
 
     my $selectcand;
     if ($nequal > 1) {
-	my @all = map { $_->{Cand} } @maybe[0 .. $nequal-1];
+	my @all = sort map { $_->{Cand} } @maybe[0 .. $nequal-1];
 	my $tiekey = $signum > 0 ? 'Win' : 'Lose';
 	$selectcand = $tie{"@all"}{$tiekey};
 	die "need tie break, want $tiekey from @all"
@@ -307,7 +310,7 @@ sub select_best_worst ($$$$) {
 	    $selectcand, "@all";
     } else {
 	$selectcand = $maybe[0]{Cand};
-	prf "$what %s\n", $selectcand;
+	prfm "$what %s\n", $selectcand;
     }
 
     return $cands{$selectcand};
@@ -315,7 +318,7 @@ sub select_best_worst ($$$$) {
 
 sub elect_core ($) {
     my ($c) = @_;
-    prf "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
+    prfm "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
     $c->{NonCont} = 'Elected';
     push @elected, $c;
 }
@@ -330,7 +333,7 @@ for (;;) {
 
     my $seats_remain = $seats - @elected;
 
-    prf "seats remaining %d\n", $seats_remain;
+    prfm "seats remaining %d\n", $seats_remain;
 
     last unless $seats_remain;
 
@@ -386,7 +389,7 @@ for (;;) {
 		die unless $tspr{"@$previously"} == $xfervalue;
 	    } else {
 		$tspr{"@$previously"} = $xfervalue;
-		prf "transfer value of ballots %20s: %s\n",
+		prfm "transfer value of ballots %20s: %s\n",
 		    "@$previously", sv $xfervalue;
 	    }
 	}
@@ -403,7 +406,7 @@ for (;;) {
 	-1, 'eliminating';
 
     if ($c) {
-	prf "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
+	prfm "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
 	$c->{NonCont} = 'Eliminated';
 
 	sortballots @{ $c->{Votes} };