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
compute-scottish-stv: prep for --for-compare to list winners too (nfc)
[appendix-a6.git]
/
compute
diff --git
a/compute
b/compute
index 72e525935e7925b57aa03147c02735fe9f44c146..bd9ed7c6ab9e0b01d9a89f4cdcff95eed7ec6c07 100755
(executable)
--- a/
compute
+++ b/
compute
@@
-203,7
+203,7
@@
foreach my $iv (@invotes_v) {
my $vchr = $vs[$ix];
if ($vchr eq '-') {
$vs[$ix] = 1000;
my $vchr = $vs[$ix];
if ($vchr eq '-') {
$vs[$ix] = 1000;
- } elsif ($vchr =~ m/[0-9
a-z
]/) {
+ } elsif ($vchr =~ m/[0-9
A-Z
]/) {
$vs[$ix] = ord($vchr);
} else {
die "bad vote char";
$vs[$ix] = ord($vchr);
} else {
die "bad vote char";
@@
-305,8
+305,10
@@
foreach my $ia (0..$#ch) {
" ($vab > $vba = +$diff)\n";
$defeats->add_edge($choices[$ia],$choices[$ib]);
my $label = "$diff($vab:$vba)";
" ($vab > $vba = +$diff)\n";
$defeats->add_edge($choices[$ia],$choices[$ib]);
my $label = "$diff($vab:$vba)";
- $label .= "\n". join ' ', @{ $vab[$ia][$ib] };
- $label .= "\n/". join ' ', @{ $vab[$ib][$ia] };
+ if (@invotes_v < 10) {
+ $label .= "\n". join ' ', @{ $vab[$ia][$ib] };
+ $label .= "\n/". join ' ', @{ $vab[$ib][$ia] };
+ }
$defeats->set_edge_attribute($choices[$ia],$choices[$ib],
label => $label);
}
$defeats->set_edge_attribute($choices[$ia],$choices[$ib],
label => $label);
}
@@
-428,7
+430,7
@@
printf " %-5s %s\n", $_, $choices{$_}{Desc}
if (defined $gfile) {
foreach my $cho (values %choices) {
my $chn = $choices[$cho->{Index}];
if (defined $gfile) {
foreach my $cho (values %choices) {
my $chn = $choices[$cho->{Index}];
- my $label = "
\\N
\n$cho->{Desc}";
+ my $label = "
$chn
\n$cho->{Desc}";
if ($cho->{Dropped}) {
$label .= "\nDropped: $cho->{Dropped}";
}
if ($cho->{Dropped}) {
$label .= "\nDropped: $cho->{Dropped}";
}