chiark
/
gitweb
/
~ian
/
appendix-a6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4f77b4
)
wip
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 2 Feb 2014 21:35:23 +0000
(21:35 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 2 Feb 2014 21:35:23 +0000
(21:35 +0000)
parse
patch
|
blob
|
history
diff --git
a/parse
b/parse
index f629457c42a04bc11ad9b6196152de80cdaa0dca..13fe2f23395fabb16bb0a9b15d3bc6496f9454ea 100755
(executable)
--- a/
parse
+++ b/
parse
@@
-58,7
+58,7
@@
our @vab;
# Go through the voters and construct V(A,B)
-print "\n
Defeats
matrix\n";
+print "\n
Preference
matrix\n";
foreach my $iv (@invotes) {
my ($votestr,$voter) = @$iv;
@@
-148,7
+148,9
@@
foreach my $i (0..$#choices) {
drop $i, "majority ratio ($vad * $majr->[1] <= $vda * $majr->[0])";
}
-my $defeats = Graph::Directed->new; # A.6(4)
+print "\nDefeats A.6(4)\n";
+
+my $defeats = Graph::Directed->new;
sub chremain () {
return grep { !$ch[$_]{Dropped} } (0..$#ch);