minor optimization

git-svn-id: svn://rubyforge.org/var/svn/rubyvote/trunk@23 1440c7f4-e209-0410-9a04-881b5eb134a8

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index b0471ecce2d7a5d7ab8010dcfac8fd42f6e7bf88..4dd1745ebbaad2f16e57052bc1836c4cf9b332b2 100644 (file)
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -229,12 +229,15 @@ class CloneproofSSDResult < CondorcetResult
       candidates = [candidates] unless candidates.class == Array
       candidates.each do |cand1|
         candidates.each do |cand2|
       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
             end
           end
         end