chiark
/
gitweb
/
~ian
/
appendix-a6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
49ea4a7
)
compute-scottish-stv: make --for-compare leave out some stuff which is in prose in...
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 23 Aug 2016 12:49:59 +0000
(13:49 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 23 Aug 2016 12:49:59 +0000
(13:49 +0100)
compute-scottish-stv
patch
|
blob
|
history
diff --git
a/compute-scottish-stv
b/compute-scottish-stv
index 43d3a7286f3158f8a09277aa6ca60042e9b96274..98ec3082bd92de269a79af720f4ba8472c8f163a 100755
(executable)
--- a/
compute-scottish-stv
+++ b/
compute-scottish-stv
@@
-207,6
+207,9
@@
sub prf {
my $fmt = shift;
printf " ".$fmt, @_;
}
my $fmt = shift;
printf " ".$fmt, @_;
}
+sub prfm {
+ prf @_ unless $for_compare;
+}
sub countballots () {
my @pr;
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);
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 () {
@@
-307,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};
@@
-315,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;
}
@@
-330,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;
@@
-386,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;
}
}
@@
-403,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} };