projects
/
rubyvote
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Helped fix the bug in def defeats that was causing cpssd() to return
[rubyvote]
/
lib
/
rubyvote
/
condorcet.rb
diff --git
a/lib/rubyvote/condorcet.rb
b/lib/rubyvote/condorcet.rb
index 08fd2dfed617dcb36baf253aec7960abdf5d7041..2c5e03a028ac49aae97ab0fcab901c971cb7407e 100644
(file)
--- a/
lib/rubyvote/condorcet.rb
+++ b/
lib/rubyvote/condorcet.rb
@@
-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
@@
-242,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?