From: John Dong <jdong@mit.edu>
Date: Wed, 15 Aug 2007 19:54:13 +0000 (-0400)
Subject: Merge from head
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/343bc338d381da77f55b0231316c237c7502cbc2?hp=06bede5ddbcd7f26e50a958c4d64527580cc38c9

Merge from head
---

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index 65c664d..c0539ab 100644
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -184,7 +184,10 @@ class PureCondorcetResult < CondorcetResult
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
-
+    unless votes.length>0 and candidates.length>0
+      @winners=[nil]
+      return @winners
+    end
     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new
diff --git a/lib/rubyvote/irv.rb b/lib/rubyvote/irv.rb
index 3851738..b26b1d1 100644
--- a/lib/rubyvote/irv.rb
+++ b/lib/rubyvote/irv.rb
@@ -87,6 +87,11 @@ class InstantRunoffResult < ElectionResult
       apply_retention(votes, votes_sum * params['percent_retention'])
     end
     
+    unless votes.length > 0
+      @winners=[nil]
+      return
+    end
+
     begin
       ranked_candidates = votes.sort do |a, b|
         b[1][0] <=> a[1][0]