From: John Dong Date: Fri, 17 Aug 2007 00:23:05 +0000 (-0400) Subject: Import new svn rubyvote (revno 43) X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/0f9de7a83f46b302d82dbeb66def7f12ae15077a?hp=-c Import new svn rubyvote (revno 43) --- 0f9de7a83f46b302d82dbeb66def7f12ae15077a diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb index 7153995..f86e59d 100644 --- a/lib/rubyvote/condorcet.rb +++ b/lib/rubyvote/condorcet.rb @@ -154,7 +154,7 @@ class CondorcetResult < ElectionResult @matrix = voteobj.votes end - def list_defeats + def victories_and_ties victors = Array.new ties = Array.new candidates = @matrix.keys.sort @@ -178,11 +178,12 @@ class CondorcetResult < ElectionResult 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 - candidates = [candidates] unless candidates.class == Array 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 - unless votes.length>0 and candidates.length>0 - @winners=[] - return @winners + + unless votes.length > 0 and candidates.length > 0 + return @winners=[] end + 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() - @winners.delete nil 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| diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb index ffd31c8..5a58243 100644 --- a/lib/rubyvote/election.rb +++ b/lib/rubyvote/election.rb @@ -45,7 +45,7 @@ class ElectionVote if self.verify_vote(vote) self.tally_vote(vote) else - raise InvalidVoteError.new ("Invalid vote object", vote) + raise InvalidVoteError.new("Invalid vote object", vote) end end else