projects
/
rubyvote
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#filter_out and PureCondorcet weren't getting along well for sparse elections
[rubyvote]
/
lib
/
rubyvote
/
condorcet.rb
diff --git
a/lib/rubyvote/condorcet.rb
b/lib/rubyvote/condorcet.rb
index 68b3c708d25fa324dd2d361b210fc10fd0184a08..3269261bb681bb58d230c06af68d77ca7b3439f8 100644
(file)
--- a/
lib/rubyvote/condorcet.rb
+++ b/
lib/rubyvote/condorcet.rb
@@
-56,14
+56,13
@@
class CondorcetVote < ElectionVote
if vote.length - 1 == index
losers = []
else
if vote.length - 1 == index
losers = []
else
- losers = vote.
last( vote.flatten.length - index
)
+ losers = vote.
flatten.last( vote.flatten.length - index - 1
)
end
losers.each do |place|
place = [place] unless place.class == Array
place.each do |loser|
end
losers.each do |place|
place = [place] unless place.class == Array
place.each do |loser|
- next if winner == loser
@votes[winner] = Hash.new unless @votes.has_key?(winner)
@votes[loser] = Hash.new unless @votes.has_key?(loser)
@votes[winner] = Hash.new unless @votes.has_key?(winner)
@votes[loser] = Hash.new unless @votes.has_key?(loser)
@@
-76,21
+75,13
@@
class CondorcetVote < ElectionVote
# make sure we have a comparable object
@votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
# make sure we have a comparable object
@votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
-
- @candidates << loser unless @candidates.include?( loser )
end
end
end
end
def result
end
end
end
end
def result
- top_result = resultFactory( self )
- until @candidates.empty?
- aResult = resultFactory( self )
- top_result.full_results << aResult
- filter_out(aResult)
- end
- top_result
+ resultFactory( self )
end
protected
end
protected
@@
-111,6
+102,17
@@
class CloneproofSSDVote < CondorcetVote
def resultFactory(init)
CloneproofSSDResult.new(init)
end
def resultFactory(init)
CloneproofSSDResult.new(init)
end
+
+ def result
+ top_result = resultFactory( self )
+ until @candidates.empty?
+ aResult = resultFactory( self )
+ top_result.full_results << aResult
+ filter_out(aResult)
+ end
+ top_result
+ end
+
end
end
@@
-135,6
+137,7
@@
class CondorcetResult < ElectionResult
votes = @election.votes unless votes
defeats = Array.new
votes = @election.votes unless votes
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
@@
-206,6
+209,7
@@
class CloneproofSSDResult < CondorcetResult
# see the array with the standard defeats
transitive_defeats = self.defeats(candidates, votes)
# see the array with the standard defeats
transitive_defeats = self.defeats(candidates, votes)
+ candidates = [candidates] unless candidates.class == Array
candidates.each do |cand1|
candidates.each do |cand2|
candidates.each do |cand3|
candidates.each do |cand1|
candidates.each do |cand2|
candidates.each do |cand3|
Benjamin Mako Hill
||
Want to submit a patch?