X-Git-Url: https://projects.mako.cc/source/rubyvote/blobdiff_plain/edff22dc7bd8517bff039e3346f2a85bf0aed754..f7c9e07cba2bbd115e1ae82b1a407b1c6e603775:/lib/rubyvote/condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index b0471ec..cee10db 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -120,8 +120,8 @@ class CondorcetVote < ElectionVote
 end
 
 class PureCondorcetVote < CondorcetVote
-  def result
-    PureCondorcetResult.new(self)
+  def resultFactory(init)
+    PureCondorcetResult.new(init)
   end
 end
 
@@ -149,6 +149,7 @@ class CondorcetResult < ElectionResult
   end
 
   protected
+
   def defeats(candidates=nil, votes=nil)
     candidates = @election.candidates unless candidates
     votes = @election.votes unless votes
@@ -176,6 +177,7 @@ class PureCondorcetResult < CondorcetResult
   end
 
   protected
+
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
@@ -190,11 +192,18 @@ class PureCondorcetResult < CondorcetResult
       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
-
-    @winners << winners if winners.length == 1
   end
 end
 
@@ -205,6 +214,7 @@ class CloneproofSSDResult < CondorcetResult
   end
 
   protected
+
   def cpssd
     votes = @election.votes
     candidates = *@election.candidates
@@ -225,16 +235,22 @@ class CloneproofSSDResult < CondorcetResult
 
       # 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 |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