From: Date: Sat, 18 Aug 2007 00:08:06 +0000 (-0400) Subject: imported new version of ruby vote X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/25d4636772a7c841f9af22ba63a16c633e315ba7?hp=729d45807f8d8e179e4a723c304336e1945acf67 imported new version of ruby vote --- diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb index 7fda91b..d0210ef 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 @@ -170,8 +138,8 @@ class CondorcetResult < ElectionResult ties << [candidate, challenger] end end - end - + end + victors.each do |list| if victories.has_key?(list[0]) victories[list[0]][list[1]] = list[2] @@ -183,6 +151,14 @@ class CondorcetResult < ElectionResult 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) @@ -203,6 +179,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 diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb index 5a58243..3655a03 100644 --- a/lib/rubyvote/election.rb +++ b/lib/rubyvote/election.rb @@ -66,10 +66,6 @@ class ElectionVote self.verify_vote(vote) end - def filter_out(winner) - @candidates.delete_if {|x| winner.winners.include?(x)} - end - end class PluralityVote < ElectionVote @@ -118,6 +114,7 @@ end class ElectionResult attr_reader :winners + attr_reader :election def initialize(voteobj=nil) unless voteobj and voteobj.kind_of?( ElectionVote ) @@ -135,7 +132,7 @@ class ElectionResult def winner? @winners.length > 0 and not @winners[0].nil? end - + end class PluralityResult < ElectionResult