better msgs

[appendix-a6.git] / compute

diff --git a/compute b/compute
index 45076cd8b2a3326420afc7dc0e35e1311001c300..61c0350e72e726a84b6c9b8170372148ec528430 100755 (executable)
--- a/compute
+++ b/compute
@@ -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"
+        if @invotes_cc;
 # actually, we pre-parse them into @invotes_v
 # since we want to show them as a tally sheet anyway
 
@@ -132,7 +133,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 +224,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])";
     }
 }