X-Git-Url: https://projects.mako.cc/source/rubyvote/blobdiff_plain/0ef8f53fb812bcc40337a92f9c4d11ab193f73a9..ca21f7527ba633db0457aa6cffc691c1eb4925ca:/lib/rubyvote/condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index b3bdcd6..68b3c70 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -33,33 +33,64 @@
 
 class CondorcetVote < ElectionVote
 
+  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)
+  end
+
   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 )
+      if vote.flatten.length < @candidates.length
+        implied_losers = @candidates.select { |c| not vote.include?(c) }
+        vote.push(implied_losers)
+      end
+      if vote.length - 1 == index
+        losers = []
+      else
+        losers = vote.last( vote.flatten.length - index )
+      end
 
-      losers.each do |loser|
-        next if winner == loser
+      losers.each do |place|
+        place = [place] unless place.class == Array
+        place.each do |loser|
+          
+          next if winner == loser
 
-        @votes[winner] = Hash.new unless @votes.has_key?(winner)
-        @votes[loser] = Hash.new unless @votes.has_key?(loser)
+          @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
+          end
 
-        # make sure we have a comparable object
-        @votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
+          # make sure we have a comparable object
+          @votes[loser][winner] = 0 unless @votes[loser].has_key?( winner )
 
-        @candidates << loser unless @candidates.include?( loser )
+          @candidates << loser unless @candidates.include?( loser )
+        end
       end
+    end
+  end
 
-      @candidates << winner unless @candidates.include?( winner )
+  def result
+    top_result = resultFactory( self )
+    until @candidates.empty?
+      aResult = resultFactory( self )
+      top_result.full_results << aResult
+      filter_out(aResult)
     end
+    top_result
   end
 
   protected
@@ -67,18 +98,18 @@ class CondorcetVote < ElectionVote
     vote.instance_of?( Array ) and
       vote == vote.uniq
   end
-  
+
 end
 
 class PureCondorcetVote < CondorcetVote
-  def result
-    PureCondorcetResult.new( self )
+  def resultFactory(init)
+    PureCondorcetResult.new(init)
   end
 end
 
 class CloneproofSSDVote < CondorcetVote
-  def result
-    CloneproofSSDResult.new( self )
+  def resultFactory(init)
+    CloneproofSSDResult.new(init)
   end
 end