Caught error from testcase! Quickvote creation errors weren't being properly returned.

[selectricity] / lib / rubyvote / condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index 95663d4e4dbee63bbc4a97fea93c90c3791ef3bf..f86e59d1295cdc876b9d9f380892452c5f3bab04 100644 (file)
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -32,54 +32,107 @@
 ## the CloneproofSSDVote classes but should not be used directly.
 
 class CondorcetVote < ElectionVote
 ## the CloneproofSSDVote classes but should not be used directly.
 
 class CondorcetVote < ElectionVote

+  
+  attr_accessor :results
+
+  def initialize(votes=nil)
+    unless defined?(@candidates)
+      @candidates = Array.new
+      votes.each do |vote_row|
+        vote_row = vote_row.flatten if vote_row.class == Array
+        vote_row.each do |vote| 
+          @candidates << vote unless @candidates.include?(vote)
+        end
+      end
+    end
+    super(votes)
+    @results = Array.new
+  end

 
   def tally_vote(vote=nil)
 
 
   def tally_vote(vote=nil)
 

-    vote.each_with_index do |winner, index|
-      # only run through this if this *is* preferred to something
-      break if vote.length - 1 == index
-      losers = vote.last( vote.length - index )
-
-      losers.each do |loser|
-        next if winner == loser
+    vote.each_with_index do |winners, index|
+      if vote.flatten.length < @candidates.length
+        implied_losers = @candidates.select { |c| not vote.flatten.include?(c) }
+        vote.push(implied_losers)
+      end
+      if vote.length - 1 == index
+        losers = []
+      else
+        losers = vote.flatten.last( vote.flatten.length - index - 1)
+      end

 
 

-        @votes[winner] = Hash.new unless @votes.has_key?(winner)
-        @votes[loser] = Hash.new unless @votes.has_key?(loser)
+      losers.each do |place|
+        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

 
 

-        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

         end
         end

-
-        # make sure we have a comparable object
-        @votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
-
-        @candidates << loser unless @candidates.include?( loser )

       end
       end

+    end
+  end

 
 

-      @candidates << winner unless @candidates.include?( winner )
+  def results
+    if @results.size < 2 && (not @candidates.empty?)
+      tabulate

     end
     end

+    @results
+  end
+
+  def result
+    find_only_winner unless @winner
+    @winner

   end
 
   protected
   end
 
   protected

+

   def verify_vote(vote=nil)
     vote.instance_of?( Array ) and
       vote == vote.uniq
   end
   def verify_vote(vote=nil)
     vote.instance_of?( Array ) and
       vote == vote.uniq
   end

-  
+
+  def tabulate
+    find_only_winner unless @winner
+    until @candidates.empty? 
+      aResult = resultFactory( self )
+      @results << aResult.winners
+      filter_out(aResult)
+    end
+  end
+
+  def find_only_winner
+    @winner = resultFactory( self )
+    @results << @winner.winners
+    filter_out(@winner)
+  end
+

 end
 
 class PureCondorcetVote < CondorcetVote
 end
 
 class PureCondorcetVote < CondorcetVote

-  def result
-    PureCondorcetResult.new( self )
+  def resultFactory(init)
+    PureCondorcetResult.new(init)

   end
 end
 
 class CloneproofSSDVote < CondorcetVote
   end
 end
 
 class CloneproofSSDVote < CondorcetVote

-  def result
-    CloneproofSSDResult.new( self )
+  def resultFactory(init)
+    CloneproofSSDResult.new(init)

   end
   end

+

 end
 
 
 end
 
 


@@ -91,16 +144,44 @@ end
 ## directly.
 
 class CondorcetResult < ElectionResult
 ## directly.
 
 class CondorcetResult < ElectionResult

+  attr_reader :matrix
+  

   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( CondorcetVote )
       raise ArgumentError, "You must pass a CondorcetVote array.", caller
     end
     super(voteobj)
   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( CondorcetVote )
       raise ArgumentError, "You must pass a CondorcetVote array.", caller
     end
     super(voteobj)

+    @matrix = voteobj.votes

   end
   end

-
+  
+  def victories_and_ties
+    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)
   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.each do |candidate|
 
     defeats = Array.new
     candidates.each do |candidate|


@@ -124,10 +205,15 @@ class PureCondorcetResult < CondorcetResult
   end
 
   protected
   end
 
   protected

+  

   def condorcet
     votes = @election.votes
     candidates = @election.candidates
 
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
 

+    unless votes.length > 0 and candidates.length > 0
+      return @winners=[]
+    end
+

     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new
     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new


@@ -138,11 +224,18 @@ class PureCondorcetResult < CondorcetResult
       victors[winner] << loser
     end
 
       victors[winner] << loser
     end
 

-    winners = @election.candidates.find_all do |candidate|
-        victors[candidate].length == @election.candidates.length - 1
+    victory_margin = 1
+    while true
+      winners = @election.candidates.find_all do |candidate|
+        victors[candidate].length == @election.candidates.length - victory_margin
+      end
+      if winners.length > 0
+        @winners = winners
+        return @winners
+      else
+        victory_margin += 1
+      end

     end
     end

-
-    @winners = winners if winners.length == 1

   end
 end
 
   end
 end
 


@@ -153,9 +246,10 @@ class CloneproofSSDResult < CondorcetResult
   end
 
   protected
   end
 
   protected

+

   def cpssd
     votes = @election.votes
   def cpssd
     votes = @election.votes

-    candidates = *@election.candidates
+    candidates = @election.candidates.dup

 
     def in_schwartz_set?(candidate, candidates, transitive_defeats)
       candidates.each do |challenger|
 
     def in_schwartz_set?(candidate, candidates, transitive_defeats)
       candidates.each do |challenger|


@@ -173,15 +267,22 @@ class CloneproofSSDResult < CondorcetResult
 
       # see the array with the standard defeats
       transitive_defeats = self.defeats(candidates, votes)
 
       # see the array with the standard defeats
       transitive_defeats = self.defeats(candidates, votes)

+      defeats_hash = Hash.new
+      transitive_defeats.each { |td| defeats_hash[td] = 1 }

 
 

+      candidates = [candidates] unless candidates.class == Array

       candidates.each do |cand1|
         candidates.each do |cand2|
       candidates.each do |cand1|
         candidates.each do |cand2|

-          candidates.each do |cand3|
-            if transitive_defeats.include?( [ cand2, cand1 ] ) and
-                transitive_defeats.include?( [ cand1, cand3 ] ) and
-                not transitive_defeats.include?( [ cand2, cand3 ] ) and
-                not cand2 == cand3
-              transitive_defeats << [ cand2, cand3 ]
+          unless cand1 == cand2
+            candidates.each do |cand3|
+              if not cand2 == cand3 and 
+                  not cand1 == cand3 and 
+                  defeats_hash[[cand2, cand1]] and
+                  defeats_hash[[cand1, cand3]] and
+                  not defeats_hash[[cand2, cand3]] 
+                transitive_defeats << [cand2, cand3]
+                defeats_hash[[cand2, cand3]] = 1
+              end

             end
           end
         end
             end
           end
         end