X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/8ae0d71896fa022dd80e5a5de993e1382564fcb1..bf1d24c356406d42a28aa8bb35e9bd567eefca9f:/lib/rubyvote/condorcet.rb?ds=sidebyside diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb index 7153995..0c6fd56 100644 --- a/lib/rubyvote/condorcet.rb +++ b/lib/rubyvote/condorcet.rb @@ -33,8 +33,6 @@ class CondorcetVote < ElectionVote - attr_accessor :results - def initialize(votes=nil) unless defined?(@candidates) @candidates = Array.new @@ -46,7 +44,6 @@ class CondorcetVote < ElectionVote end end super(votes) - @results = Array.new end def tally_vote(vote=nil) @@ -86,53 +83,24 @@ class CondorcetVote < ElectionVote end end - def results - if @results.size < 2 && (not @candidates.empty?) - tabulate - end - @results - end - - def result - find_only_winner unless @winner - @winner - end - protected def verify_vote(vote=nil) vote.instance_of?( Array ) and vote == vote.uniq end - - def tabulate - find_only_winner unless @winner - until @candidates.empty? - aResult = resultFactory( self ) - @results << aResult.winners - filter_out(aResult) - end - end - - def find_only_winner - @winner = resultFactory( self ) - @results << @winner.winners - filter_out(@winner) - end - end class PureCondorcetVote < CondorcetVote - def resultFactory(init) - PureCondorcetResult.new(init) + def result + PureCondorcetResult.new(self) end end class CloneproofSSDVote < CondorcetVote - def resultFactory(init) - CloneproofSSDResult.new(init) + def result + CloneproofSSDResult.new(self) end - end @@ -154,35 +122,40 @@ class CondorcetResult < ElectionResult @matrix = voteobj.votes end - def list_defeats - victors = Array.new - ties = Array.new + def victories_and_ties + victories_ties = {} candidates = @matrix.keys.sort candidates.each do |candidate| candidates.each do |challenger| next if candidate == challenger diff = @matrix[candidate][challenger] - @matrix[challenger][candidate] - if diff > 0 - victors << [candidate, challenger, diff] - elsif diff == 0 && ties.include?([challenger, candidate]) == false - ties << [candidate, challenger] + victories_ties[candidate] = {} unless victories_ties.key?(candidate) + if diff >= 0 + victories_ties[candidate][challenger] = diff end end end - victories = victors.sort {|a,b| b[2] <=> a[2]} - - return victories, ties + return victories_ties + end + + def ranked_candidates + if not defined?(@ranked_candidates) + @ranked_candidates = build_ranked_candidates() + end + + @ranked_candidates end 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 @@ -194,6 +167,27 @@ class CondorcetResult < ElectionResult defeats end + + def build_ranked_candidates + # build a lis of ranked candidates by dropping the winner and + # cursing + + ranked_candidates = [] + + resultobj = self.dup + candidates = self.election.candidates + + until candidates.empty? + ranked_candidates << resultobj.winners + + new_voteobj = resultobj.election.dup + candidates = new_voteobj.candidates + new_voteobj.candidates.delete_if {|x| resultobj.winners.include?(x)} + resultobj = new_voteobj.result + end + + ranked_candidates + end end @@ -208,10 +202,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 +236,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|