Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/match.rb

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb b/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb
new file mode 100644
index 0000000..19ac9a7
--- /dev/null
+++ b/lib/scoring_algorithms/FibonacciPeerWithBlowout.rb
@@ -0,0 +1,16 @@
+require 'ScoringAlgorithm'
+
+class FibonacciPeerWithBlowout < ScoringAlgorithm
+
+	def self.score(match, interface)
+		match.players.each do |player|
+			scores[player.user_name] = scoreUser(interface.getStatistic(match, player, :votes), match.win?(player), match.blowout)
+		end
+		scores
+	end
+
+	def self.scoreUser(votes, win, blowout)
+		fibonacci = Hash.new { |h,k| h[k] = k < 2 ? k : h[k-1] + h[k-2] }
+		fibonacci[votes+3] + (win ? blowout ? 12 : 10 : blowout ? 5 : 7)
+	end
+end
\ No newline at end of file