]> projects.mako.cc - selectricity-live/blobdiff - lib/rubyvote/condorcet.rb
Check in a bit of partial work on controller testcases, but I'm calling it a day...
[selectricity-live] / lib / rubyvote / condorcet.rb
index 715399566e270db367d311c9a26d2f7c08fd1bcf..7fda91b48073a0308c8040ddba03ac13d8822929 100644 (file)
@@ -154,9 +154,10 @@ class CondorcetResult < ElectionResult
     @matrix = voteobj.votes
   end
   
-  def list_defeats
+  def victories_and_ties
     victors = Array.new
     ties = Array.new
+    victories = Hash.new
     candidates = @matrix.keys.sort
     
     candidates.each do |candidate|
@@ -170,19 +171,27 @@ class CondorcetResult < ElectionResult
         end
       end
     end
-    
-    victories = victors.sort {|a,b| b[2] <=> a[2]}
+     
+    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
@@ -208,10 +217,11 @@ class PureCondorcetResult < CondorcetResult
   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
@@ -241,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|

Benjamin Mako Hill || Want to submit a patch?