Fix broken Plurality vote by removing a type check in RubyVote. TODO: Figure out...

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 5f566c6eb1e6575e1f8f6a7845e67ba21d963c53..c427b981d78120d54ee429f8f2ee9280f9f310a9 100644 (file)
--- 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
       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
     @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
 
     #@runoff_result = InstantRunoffVote.new(preference_tally).result
     #@runoff_results = PluralityVote.new(preference_tally).result
 

-

   end
 
   ### Convert a shortname or id into a QuickVote
   end
 
   ### Convert a shortname or id into a QuickVote

diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb
index 75614e6b6d294995fb53cb7de45b5daf35884de2..66e4c2a4b410b83a2af50d12172e64c644cc531a 100644 (file)
--- a/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@ -75,7 +75,7 @@ class PluralityVote < ElectionVote
   
   protected
   def verify_vote(vote=nil)
   
   protected
   def verify_vote(vote=nil)

-    vote.instance_of?( String )
+    not vote.instance_of?( Array )

   end
 
   def tally_vote(candidate)
   end
 
   def tally_vote(candidate)