X-Git-Url: https://projects.mako.cc/source/rubyvote/blobdiff_plain/af3fdc3766e13c5e7b0aa01023285b25303d901f..00afdac0dfc6a9073e196a80e62a203ffcc457bf:/lib/rubyvote/condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index bf4e548..08fd2df 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -153,7 +153,29 @@ class CondorcetResult < ElectionResult
     super(voteobj)
     @matrix = voteobj.votes
   end
-
+  
+  def list_defeats
+    victors = Array.new
+    ties = Array.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
+    
+    victories = victors.sort {|a,b| b[2] <=> a[2]}
+    
+    return victories, ties    
+  end
+        
   protected
   def defeats(candidates=nil, votes=nil)
     candidates = @election.candidates unless candidates
@@ -182,14 +204,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