projects
/
rubyvote
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed name of defeats_list to victories_and_ties
[rubyvote]
/
lib
/
rubyvote
/
condorcet.rb
diff --git
a/lib/rubyvote/condorcet.rb
b/lib/rubyvote/condorcet.rb
index 715399566e270db367d311c9a26d2f7c08fd1bcf..f86e59d1295cdc876b9d9f380892452c5f3bab04 100644
(file)
--- a/
lib/rubyvote/condorcet.rb
+++ b/
lib/rubyvote/condorcet.rb
@@
-154,7
+154,7
@@
class CondorcetResult < ElectionResult
@matrix = voteobj.votes
end
@matrix = voteobj.votes
end
- def
list_defeat
s
+ def
victories_and_tie
s
victors = Array.new
ties = Array.new
candidates = @matrix.keys.sort
victors = Array.new
ties = Array.new
candidates = @matrix.keys.sort
@@
-178,11
+178,12
@@
class CondorcetResult < ElectionResult
protected
def defeats(candidates=nil, votes=nil)
protected
def defeats(candidates=nil, votes=nil)
- candidates = @election.candidates unless candidates
- votes = @election.votes unless votes
+ candidates ||= @election.candidates || []
+ # we're assumign that if there are candidates, there must be at
+ # least one vote for them
+ votes ||= @election.votes
defeats = Array.new
defeats = Array.new
- candidates = [candidates] unless candidates.class == Array
candidates.each do |candidate|
candidates.each do |challenger|
next if candidate == challenger
candidates.each do |candidate|
candidates.each do |challenger|
next if candidate == challenger
@@
-208,10
+209,11
@@
class PureCondorcetResult < CondorcetResult
def condorcet
votes = @election.votes
candidates = @election.candidates
def condorcet
votes = @election.votes
candidates = @election.candidates
- unless votes.length>0 and candidates.length>0
- @winners=[]
- return @winners
+
+ unless votes.length > 0 and candidates.length > 0
+ return @winners
=[]
end
end
+
victors = Hash.new
candidates.each do |candidate|
victors[candidate] = Array.new
victors = Hash.new
candidates.each do |candidate|
victors[candidate] = Array.new
@@
-241,14
+243,13
@@
class CloneproofSSDResult < CondorcetResult
def initialize(voteobj=nil)
super(voteobj)
@winners = self.cpssd()
def initialize(voteobj=nil)
super(voteobj)
@winners = self.cpssd()
- @winners.delete nil
end
protected
def cpssd
votes = @election.votes
end
protected
def cpssd
votes = @election.votes
- candidates =
*@election.candidates
+ candidates =
@election.candidates.dup
def in_schwartz_set?(candidate, candidates, transitive_defeats)
candidates.each do |challenger|
def in_schwartz_set?(candidate, candidates, transitive_defeats)
candidates.each do |challenger|
Benjamin Mako Hill
||
Want to submit a patch?