X-Git-Url: https://projects.mako.cc/source/rubyvote/blobdiff_plain/f7c9e07cba2bbd115e1ae82b1a407b1c6e603775..ad05e67f416f8e1c9fb5de1d015fc057ee85961d:/lib/rubyvote/condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index cee10db..aaa5044 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -51,9 +51,9 @@ class CondorcetVote < ElectionVote
 
   def tally_vote(vote=nil)
 
-    vote.each_with_index do |winner, index|
+    vote.each_with_index do |winners, index|
       if vote.flatten.length < @candidates.length
-        implied_losers = @candidates.select { |c| not vote.include?(c) }
+        implied_losers = @candidates.select { |c| not vote.flatten.include?(c) }
         vote.push(implied_losers)
       end
       if vote.length - 1 == index
@@ -66,18 +66,21 @@ class CondorcetVote < ElectionVote
         place = [place] unless place.class == Array
         place.each do |loser|
           
+          winners = [winners] unless winners.class == Array
+          next if winners.include?(loser)
+          winners.each do |winner|
+            @votes[winner] = Hash.new unless @votes.has_key?(winner)
+            @votes[loser] = Hash.new unless @votes.has_key?(loser)
+
+            if @votes[winner].has_key?(loser)
+              @votes[winner][loser] += 1
+            else
+              @votes[winner][loser] = 1
+            end
 
-          @votes[winner] = Hash.new unless @votes.has_key?(winner)
-          @votes[loser] = Hash.new unless @votes.has_key?(loser)
-
-          if @votes[winner].has_key?(loser)
-            @votes[winner][loser] += 1
-          else
-            @votes[winner][loser] = 1
+            # make sure we have a comparable object
+            @votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
           end
-
-          # make sure we have a comparable object
-          @votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
         end
       end
     end
@@ -181,7 +184,10 @@ class PureCondorcetResult < CondorcetResult
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
-
+    unless votes.length>0 and candidates.length>0
+      @winners=[]
+      return @winners
+    end
     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new
@@ -211,6 +217,7 @@ class CloneproofSSDResult < CondorcetResult
   def initialize(voteobj=nil)
     super(voteobj)
     @winners = self.cpssd()
+    @winners.delete nil
   end
 
   protected