Import new svn rubyvote (revno 43)

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index 715399566e270db367d311c9a26d2f7c08fd1bcf..f86e59d1295cdc876b9d9f380892452c5f3bab04 100644 (file)
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -154,7 +154,7 @@ class CondorcetResult < ElectionResult
     @matrix = voteobj.votes
   end
   
     @matrix = voteobj.votes
   end
   

-  def list_defeats
+  def victories_and_ties

     victors = Array.new
     ties = Array.new
     candidates = @matrix.keys.sort
     victors = Array.new
     ties = Array.new
     candidates = @matrix.keys.sort


@@ -178,11 +178,12 @@ class CondorcetResult < ElectionResult
         
   protected
   def defeats(candidates=nil, votes=nil)
         
   protected
   def defeats(candidates=nil, votes=nil)

-    candidates = @election.candidates unless candidates
-    votes = @election.votes unless votes
+    candidates ||= @election.candidates || []
+    # we're assumign that if there are candidates, there must be at
+    # least one vote for them
+    votes ||= @election.votes 

 
     defeats = Array.new
 
     defeats = Array.new

-    candidates = [candidates] unless candidates.class == Array

     candidates.each do |candidate|
       candidates.each do |challenger|
         next if candidate == challenger
     candidates.each do |candidate|
       candidates.each do |challenger|
         next if candidate == challenger


@@ -208,10 +209,11 @@ class PureCondorcetResult < CondorcetResult
   def condorcet
     votes = @election.votes
     candidates = @election.candidates
   def condorcet
     votes = @election.votes
     candidates = @election.candidates

-    unless votes.length>0 and candidates.length>0
-      @winners=[]
-      return @winners
+
+    unless votes.length > 0 and candidates.length > 0
+      return @winners=[]

     end
     end

+

     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new
     victors = Hash.new
     candidates.each do |candidate|
       victors[candidate] = Array.new


@@ -241,14 +243,13 @@ 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
 
   def cpssd
     votes = @election.votes
   end
 
   protected
 
   def cpssd
     votes = @election.votes

-    candidates = *@election.candidates
+    candidates = @election.candidates.dup

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

diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb
index ffd31c846e56400e9df945361d5a4c11ebb9df9d..5a5824341a57c1f4c9f6aef7ec14ed41f40dc693 100644 (file)
--- a/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@ -45,7 +45,7 @@ class ElectionVote
           if self.verify_vote(vote)
             self.tally_vote(vote)
           else
           if self.verify_vote(vote)
             self.tally_vote(vote)
           else

-            raise InvalidVoteError.new ("Invalid vote object", vote)
+            raise InvalidVoteError.new("Invalid vote object", vote)

           end
         end
       else
           end
         end
       else