Use WHOIS to search up meaningful organizational data about voters. NOTE: Probably...

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

diff --git a/lib/rubyvote/condorcet.rb b/lib/rubyvote/condorcet.rb
index c0539abea5f02aa5b11ddda80fd41f68e78b9b8e..bf4e548da45bcbb6d9c3ebfa57269d065bf09b6a 100644 (file)
--- a/lib/rubyvote/condorcet.rb
+++ b/lib/rubyvote/condorcet.rb
@@ -32,7 +32,7 @@
 ## the CloneproofSSDVote classes but should not be used directly.
 
 class CondorcetVote < ElectionVote
 ## the CloneproofSSDVote classes but should not be used directly.
 
 class CondorcetVote < ElectionVote

-
+  

   attr_accessor :results
 
   def initialize(votes=nil)
   attr_accessor :results
 
   def initialize(votes=nil)


@@ -144,15 +144,17 @@ end
 ## directly.
 
 class CondorcetResult < ElectionResult
 ## directly.
 
 class CondorcetResult < ElectionResult

+  attr_reader :matrix
+  

   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( CondorcetVote )
       raise ArgumentError, "You must pass a CondorcetVote array.", caller
     end
     super(voteobj)
   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( CondorcetVote )
       raise ArgumentError, "You must pass a CondorcetVote array.", caller
     end
     super(voteobj)

+    @matrix = voteobj.votes

   end
 
   protected
   end
 
   protected

-

   def defeats(candidates=nil, votes=nil)
     candidates = @election.candidates unless candidates
     votes = @election.votes unless votes
   def defeats(candidates=nil, votes=nil)
     candidates = @election.candidates unless candidates
     votes = @election.votes unless votes


@@ -185,7 +187,7 @@ class PureCondorcetResult < CondorcetResult
     votes = @election.votes
     candidates = @election.candidates
     unless votes.length>0 and candidates.length>0
     votes = @election.votes
     candidates = @election.candidates
     unless votes.length>0 and candidates.length>0

-      @winners=[nil]
+      @winners=[]

       return @winners
     end
     victors = Hash.new
       return @winners
     end
     victors = Hash.new


@@ -217,6 +219,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