X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/0bcced90721389c27eb815ca8dcab85533417697..58548f03d162cdb794b78aa272a7a3ebf1500f97:/lib/rubyvote/condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index bf4e548..7fda91b 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -153,14 +153,45 @@ class CondorcetResult < ElectionResult
     super(voteobj)
     @matrix = voteobj.votes
   end
-
+  
+  def victories_and_ties
+    victors = Array.new
+    ties = Array.new
+    victories = Hash.new
+    candidates = @matrix.keys.sort
+    
+    candidates.each do |candidate|
+      candidates.each do |challenger|
+        next if candidate == challenger
+        diff = @matrix[candidate][challenger] - @matrix[challenger][candidate]
+        if diff > 0 
+          victors << [candidate, challenger, diff]
+        elsif diff == 0 && ties.include?([challenger, candidate]) == false
+          ties << [candidate, challenger] 
+        end
+      end
+    end
+     
+    victors.each do |list|
+      if victories.has_key?(list[0])
+        victories[list[0]][list[1]] = list[2]       
+      else
+        victories[list[0]] = Hash.new
+        victories[list[0]][list[1]] = list[2]
+      end
+    end
+    
+    return victories, ties    
+  end
+        
   protected
   def defeats(candidates=nil, votes=nil)
-    candidates = @election.candidates unless candidates
-    votes = @election.votes unless votes
+    candidates ||= @election.candidates || []
+    # we're assumign that if there are candidates, there must be at
+    # least one vote for them
+    votes ||= @election.votes 
 
     defeats = Array.new
-    candidates = [candidates] unless candidates.class == Array
     candidates.each do |candidate|
       candidates.each do |challenger|
         next if candidate == challenger
@@ -182,14 +213,15 @@ class PureCondorcetResult < CondorcetResult
   end
 
   protected
-
+  
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
-    unless votes.length>0 and candidates.length>0
-      @winners=[]
-      return @winners
+
+    unless votes.length > 0 and candidates.length > 0
+      return @winners=[]
     end
+
     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new
@@ -219,14 +251,13 @@ class CloneproofSSDResult < CondorcetResult
   def initialize(voteobj=nil)
     super(voteobj)
     @winners = self.cpssd()
-    @winners.delete nil
   end
 
   protected
 
   def cpssd
     votes = @election.votes
-    candidates = *@election.candidates
+    candidates = @election.candidates.dup
 
     def in_schwartz_set?(candidate, candidates, transitive_defeats)
       candidates.each do |challenger|