input license information so that the work can be under the AGPLv3

[selectricity] / lib / rubyvote / election.rb

diff --git a/lib/rubyvote/election.rb b/lib/rubyvote/election.rb
index 5a5824341a57c1f4c9f6aef7ec14ed41f40dc693..3655a034e7575d7be3541ab49e1be12a80fb0c17 100644 (file)
--- a/lib/rubyvote/election.rb
+++ b/lib/rubyvote/election.rb
@@ -66,10 +66,6 @@ class ElectionVote
     self.verify_vote(vote)
   end
 
     self.verify_vote(vote)
   end
 

-  def filter_out(winner)
-    @candidates.delete_if {|x| winner.winners.include?(x)}
-  end
-

 end
 
 class PluralityVote < ElectionVote
 end
 
 class PluralityVote < ElectionVote


@@ -118,6 +114,7 @@ end
 
 class ElectionResult
   attr_reader :winners
 
 class ElectionResult
   attr_reader :winners

+  attr_reader :election

 
   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( ElectionVote )
 
   def initialize(voteobj=nil)
     unless voteobj and voteobj.kind_of?( ElectionVote )


@@ -135,7 +132,7 @@ class ElectionResult
   def winner?
     @winners.length > 0 and not @winners[0].nil?
   end
   def winner?
     @winners.length > 0 and not @winners[0].nil?
   end

-
+  

 end
 
 class PluralityResult < ElectionResult
 end
 
 class PluralityResult < ElectionResult