From: John Dong Date: Wed, 15 Aug 2007 21:56:18 +0000 (-0400) Subject: Merge from Justin X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/0bcced90721389c27eb815ca8dcab85533417697?hp=--cc Merge from Justin Fix runtime errors in RubyVote introduced. --- 0bcced90721389c27eb815ca8dcab85533417697 diff --cc lib/rubyvote/election.rb index 42f18bb,efb8dd8..ffd31c8 --- a/lib/rubyvote/election.rb +++ b/lib/rubyvote/election.rb @@@ -151,6 -152,8 +152,8 @@@ class PluralityResult < ElectionResul b[1] <=> a[1] end.collect {|a| a[0]} - @points = self.election.votes ++ @points = @election.votes + # winners are anyone who has the same number of votes as the # first person @winners = @ranked_candidates.find_all do |i| diff --cc lib/rubyvote/positional.rb index 3de3fb2,dc0b63a..056194b --- a/lib/rubyvote/positional.rb +++ b/lib/rubyvote/positional.rb @@@ -76,6 -77,8 +77,8 @@@ class BordaResult < ElectionResul @winners = @ranked_candidates.find_all do |i| votes[i] == votes[@ranked_candidates[0]] end + - @points = self.election.votes ++ @points = @election.votes end end