X-Git-Url: https://projects.mako.cc/source/rubyvote/blobdiff_plain/cadb8cabfdcf3cb009319e36102beaf31362da89..44dfdcf546f020f6e5546b28ac85bd722b55afdd:/lib/rubyvote/condorcet.rb?ds=sidebyside

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index 3269261..4dd1745 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -33,6 +33,8 @@
 
 class CondorcetVote < ElectionVote
 
+  attr_accessor :results
+
   def initialize(votes=nil)
     unless defined?(@candidates)
       @candidates = Array.new
@@ -44,6 +46,7 @@ class CondorcetVote < ElectionVote
       end
     end
     super(votes)
+    @results = Array.new
   end
 
   def tally_vote(vote=nil)
@@ -80,21 +83,45 @@ class CondorcetVote < ElectionVote
     end
   end
 
+  def results
+    if @results.size < 2 && (not @candidates.empty?)
+      tabulate
+    end
+    @results
+  end
+
   def result
-    resultFactory( self )
+    find_only_winner unless @winner
+    @winner
   end
 
   protected
+
   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
-  def resultFactory(init)
-    PureCondorcetResult.new(init)
+  def result
+    PureCondorcetResult.new(self)
   end
 end
 
@@ -103,16 +130,6 @@ class CloneproofSSDVote < CondorcetVote
     CloneproofSSDResult.new(init)
   end
 
-  def result
-    top_result = resultFactory( self )
-    until @candidates.empty?
-      aResult = resultFactory( self )
-      top_result.full_results << aResult
-      filter_out(aResult)
-    end
-    top_result
-  end
-
 end
 
 
@@ -212,12 +229,15 @@ class CloneproofSSDResult < CondorcetResult
       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 
+                  transitive_defeats.include?( [ cand2, cand1 ] ) and
+                  transitive_defeats.include?( [ cand1, cand3 ] ) and
+                  not transitive_defeats.include?( [ cand2, cand3 ] )
+                transitive_defeats << [ cand2, cand3 ]
+              end
             end
           end
         end