projects
/
rubyvote
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify access to full results - now available as voteobject.results,
[rubyvote]
/
lib
/
rubyvote
/
election.rb
diff --git
a/lib/rubyvote/election.rb
b/lib/rubyvote/election.rb
index 4499233ebb0bda4e0f305c6a853bbbf7c96ed454..3d816a89212e572a2c2165a2180908ab20fc7198 100644
(file)
--- a/
lib/rubyvote/election.rb
+++ b/
lib/rubyvote/election.rb
@@
-63,12
+63,7
@@
class ElectionVote
end
def filter_out(winner)
end
def filter_out(winner)
- if winner.winners[0].class == Array
- to_filter = winner.winners[0]
- else
- to_filter = [winner.winners[0]]
- end
- @candidates.delete_if {|x| to_filter.include?(x)}
+ @candidates.delete_if {|x| winner.winners.include?(x)}
end
end
end
end
@@
-119,7
+114,6
@@
end
class ElectionResult
attr_reader :winners
class ElectionResult
attr_reader :winners
- attr_accessor :full_results
def initialize(voteobj=nil)
unless voteobj and voteobj.kind_of?( ElectionVote )
def initialize(voteobj=nil)
unless voteobj and voteobj.kind_of?( ElectionVote )
@@
-128,7
+122,6
@@
class ElectionResult
@election = voteobj
@winners = Array.new
@election = voteobj
@winners = Array.new
- @full_results = Array.new
end
def winner
end
def winner
@@
-139,10
+132,6
@@
class ElectionResult
@winners.length > 0
end
@winners.length > 0
end
- def get_full_results
- @full_results.collect {|x| x.winners}
- end
-
end
class PluralityResult < ElectionResult
end
class PluralityResult < ElectionResult
Benjamin Mako Hill
||
Want to submit a patch?