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+)\]/) {
# 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
push @invotes_v, [ $vstr, $voter ];
}
+print "# devotee-tally-end\n"
+ if @invotes_cc;
+
print "\nDetermining default option\n";
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;
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])";
}
}