Merge jdong

[selectricity-live] / lib / rubyvote / condorcet.rb

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index 0b7a3062afce476f5711fe8ce471c61264d61a87..aaa504477373e07735b6eab9b7c847db0c68232a 100644 (file)
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -217,6 +217,7 @@ class CloneproofSSDResult < CondorcetResult
   def initialize(voteobj=nil)
     super(voteobj)
     @winners = self.cpssd()
   def initialize(voteobj=nil)
     super(voteobj)
     @winners = self.cpssd()

+    @winners.delete nil

   end
 
   protected
   end
 
   protected


@@ -224,7 +225,7 @@ class CloneproofSSDResult < CondorcetResult
   def cpssd
     votes = @election.votes
     candidates = *@election.candidates
   def cpssd
     votes = @election.votes
     candidates = *@election.candidates

-    
+

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