From: John Dong Date: Tue, 14 Aug 2007 22:23:06 +0000 (-0400) Subject: Fix broken Plurality vote by removing a type check in RubyVote. TODO: Figure out... X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/8afec3c5b4896fd7665e6527f3acb7c7afac7e47?hp=d86d7d89145230100980ca13bf44083ae1e954cb Fix broken Plurality vote by removing a type check in RubyVote. TODO: Figure out why it was in there --- diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb index 5f566c6..c427b98 100644 --- a/app/models/quick_vote.rb +++ b/app/models/quick_vote.rb @@ -63,7 +63,6 @@ class QuickVote < Election preference_tally << voter.vote.rankings.sort.collect \ { |ranking| ranking.candidate.id } end - @plurality_result = PluralityVote.new(plurality_tally).result @approval_result = ApprovalVote.new(approval_tally).result @condorcet_result = PureCondorcetVote.new(preference_tally).result @@ -72,7 +71,6 @@ class QuickVote < Election #@runoff_result = InstantRunoffVote.new(preference_tally).result #@runoff_results = PluralityVote.new(preference_tally).result - end ### Convert a shortname or id into a QuickVote diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb index 75614e6..66e4c2a 100644 --- a/lib/rubyvote/election.rb +++ b/lib/rubyvote/election.rb @@ -75,7 +75,7 @@ class PluralityVote < ElectionVote protected def verify_vote(vote=nil) - vote.instance_of?( String ) + not vote.instance_of?( Array ) end def tally_vote(candidate)