chiark
/
gitweb
/
~ian
/
appendix-a6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
COPYING: provide a licence
[appendix-a6.git]
/
compute-scottish-stv
diff --git
a/compute-scottish-stv
b/compute-scottish-stv
index 12645fd4d64da0ce5b13aea6f435afc48c8935d9..98ec3082bd92de269a79af720f4ba8472c8f163a 100755
(executable)
--- a/
compute-scottish-stv
+++ b/
compute-scottish-stv
@@
-207,18
+207,29
@@
sub prf {
my $fmt = shift;
printf " ".$fmt, @_;
}
my $fmt = shift;
printf " ".$fmt, @_;
}
+sub prfm {
+ prf @_ unless $for_compare;
+}
sub countballots () {
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};
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};
}
}
prf "candidate %-10s: %s votes\n", $c->{Cand}, sv $c->{Total};
}
}
@@
-227,8
+238,8
@@
sub computequota () {
my $totalvalid = 0/1;
$totalvalid += $_->{Total} foreach values %cands;
$quota = floor($totalvalid / (1 + $seats) + 1);
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;
+ prf
m
"total valid %s\n", sv $totalvalid;
+ prf
"quota %s\n", sv $quota;
}
sub total_history_cmp () {
}
sub total_history_cmp () {
@@
-299,7
+310,7
@@
sub select_best_worst ($$$$) {
$selectcand, "@all";
} else {
$selectcand = $maybe[0]{Cand};
$selectcand, "@all";
} else {
$selectcand = $maybe[0]{Cand};
- prf "$what %s\n", $selectcand;
+ prf
m
"$what %s\n", $selectcand;
}
return $cands{$selectcand};
}
return $cands{$selectcand};
@@
-307,7
+318,7
@@
sub select_best_worst ($$$$) {
sub elect_core ($) {
my ($c) = @_;
sub elect_core ($) {
my ($c) = @_;
- prf "*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
+ prf
m
"*** ELECT %s \`%s' ***\n", $c->{Cand}, $c->{Desc};
$c->{NonCont} = 'Elected';
push @elected, $c;
}
$c->{NonCont} = 'Elected';
push @elected, $c;
}
@@
-322,7
+333,7
@@
for (;;) {
my $seats_remain = $seats - @elected;
my $seats_remain = $seats - @elected;
- prf "seats remaining %d\n", $seats_remain;
+ prf
m
"seats remaining %d\n", $seats_remain;
last unless $seats_remain;
last unless $seats_remain;
@@
-378,7
+389,7
@@
for (;;) {
die unless $tspr{"@$previously"} == $xfervalue;
} else {
$tspr{"@$previously"} = $xfervalue;
die unless $tspr{"@$previously"} == $xfervalue;
} else {
$tspr{"@$previously"} = $xfervalue;
- prf "transfer value of ballots %20s: %s\n",
+ prf
m
"transfer value of ballots %20s: %s\n",
"@$previously", sv $xfervalue;
}
}
"@$previously", sv $xfervalue;
}
}
@@
-395,7
+406,7
@@
for (;;) {
-1, 'eliminating';
if ($c) {
-1, 'eliminating';
if ($c) {
- prf "=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
+ prf
m
"=== eliminating %s \`%s' ===\n", $c->{Cand}, $c->{Desc};
$c->{NonCont} = 'Eliminated';
sortballots @{ $c->{Votes} };
$c->{NonCont} = 'Eliminated';
sortballots @{ $c->{Votes} };