X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=appendix-a6.git;a=blobdiff_plain;f=compute;h=6400382c45a97e726dcb1cfa35cce2a7d74e6c2b;hp=45076cd8b2a3326420afc7dc0e35e1311001c300;hb=72430a6c24f496d33af833d4c4f00b2bd209821a;hpb=aa069a875fec88c112476ab75448df55b2c93a66

diff --git a/compute b/compute
index 45076cd..6400382 100755
--- a/compute
+++ b/compute
@@ -39,7 +39,7 @@ while (<>) {
     next if m/^\s*\#/;
     next unless m/\S/;
     next if m/^\s/;
-    if (m/^([A-Z]+)\s*\=\s*(\S.*)$/) {
+    if (m/^([A-Z0-9]+)\s*\=\s*(\S.*)$/) {
 	my ($choname, $desc) = ($1,$2);
 	my $cho = addchoice($choname, Desc => $desc);
 	if ($desc =~ m/\[(\d+):(\d+)\]/) {
@@ -66,7 +66,8 @@ our @vab;
 
 # Go through the voters and construct V(A,B)
 
-print "\nParsing \`simple' style ballots\n";
+print "\nParsing \`simple' style ballots\n# devotee-tally-begin\n"
+        if @invotes_cc;
 # actually, we pre-parse them into @invotes_v
 # since we want to show them as a tally sheet anyway
 
@@ -111,6 +112,9 @@ foreach my $iv (@invotes_cc) {
     push @invotes_v, [ $vstr, $voter ];
 }
 
+print "# devotee-tally-end\n"
+        if @invotes_cc;
+
 print "\nDetermining default option\n";
 
 if ($defcho && $defcho->{Index} > -1) {
@@ -132,7 +136,8 @@ if ($defcho && $defcho->{Index} > -1) {
 my $defi = $defcho->{Index};
 die "FD has smaj?!" if $defcho->{Smaj};
 
-print "\nParsing devotee tally sheet ballots\n";
+print "\nParsing devotee tally sheet ballots\n" 
+    if @invotes_v > @invotes_cc;
 
 foreach my $iv (@invotes_v) {
     my ($votestr,$voter) = @$iv;
@@ -222,7 +227,7 @@ if (defined $defi) {
 	my $vad = scalar @{ $vab[$i][$defi] };
 	my $vda = scalar @{ $vab[$defi][$i] };
 	next if $vad * $majr->[1] > $vda * $majr->[0];
-	drop $i, "majority ratio ($vad * $majr->[1] <= $vda * $majr->[0])";
+	drop $i, "majority ratio ($vad:$vda <= $majr->[1]:$majr->[0])";
     }
 }