} 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 {
my $fmt = shift;
printf " ".$fmt, @_;
}
+sub prfm {
+ prf @_ unless $for_compare;
+}
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;
+ }
+
+ if ($for_compare) {
+ # for comparison with OpenSTV, which always prints
+ # the quota for every elected candidate
+ push @pr, { %$_, Total => $quota } foreach @elected;
}
- 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};
}
}
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 () {
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"
$selectcand, "@all";
} else {
$selectcand = $maybe[0]{Cand};
- prf "$what %s\n", $selectcand;
+ prfm "$what %s\n", $selectcand;
}
return $cands{$selectcand};
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;
}
my $seats_remain = $seats - @elected;
- prf "seats remaining %d\n", $seats_remain;
+ prfm "seats remaining %d\n", $seats_remain;
last unless $seats_remain;
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;
}
}
-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} };