X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=appendix-a6.git;a=blobdiff_plain;f=compute;h=bd9ed7c6ab9e0b01d9a89f4cdcff95eed7ec6c07;hp=72e525935e7925b57aa03147c02735fe9f44c146;hb=74893eb17a71ef9a0626be1237d1a5c5b84bcadb;hpb=fb329ed397f6f1a7c1ba50870f77b142e0d23446

diff --git a/compute b/compute
index 72e5259..bd9ed7c 100755
--- a/compute
+++ b/compute
@@ -203,7 +203,7 @@ foreach my $iv (@invotes_v) {
 	    my $vchr = $vs[$ix];
 	    if ($vchr eq '-') {
 		$vs[$ix] = 1000;
-	    } elsif ($vchr =~ m/[0-9a-z]/) {
+	    } elsif ($vchr =~ m/[0-9A-Z]/) {
 		$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)";
-	$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);
     }
@@ -428,7 +430,7 @@ printf "    %-5s %s\n", $_, $choices{$_}{Desc}
 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}";
 	}