Merge branch 'master' of https://github.com/LukeShu/leaguer

5 files changed, 26 insertions, 21 deletions

diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb
index 1aabe34..7faa241 100644
--- a/lib/sampling/peer_review.rb
+++ b/lib/sampling/peer_review.rb
@@ -5,7 +5,7 @@ module Sampling
 		end
 
 		def self.can_get?(setting_name)
-			return setting_name.start_with?("feedback_from_") ? 2 : 0
+			return setting_name.start_with?("review_from_") ? 2 : 0
 		end
 
 		def self.uses_remote?
@@ -33,7 +33,7 @@ module Sampling
 		def render_user_interaction(user)
 			@user = user
 			@team = get_team(match)
-			@feedbacks_missing = get_feedbacks_missing(match)
+			@reviews_missing = get_reviews_missing(match)
 
 			require 'erb'
 			erb_filename = File.join(__FILE__.sub(/\.rb$/, '.html.erb'))
@@ -46,7 +46,7 @@ module Sampling
 			i = 0
 			params[:peer_review].to_s.split(',').each do |user_name|
 				reviewed_user = User.find_by_user_name(user_name)
-				user.statistics.create(match: @match, value: i)
+				reviewed_user.statistics.create(match: @match, name: "review_from_#{reviewing_user.user_name}", value: i)
 				i += 1
 			end
 		end
@@ -63,24 +63,24 @@ module Sampling
 			match.teams.find{|t|t.users.include?(@user)}
 		end
 
-		def self.get_feedbacks(match)
+		def self.get_reviews(match)
 			ret = {}
-			match.statistiscs.where("'name' LIKE 'feedback_from_%'").each do |statistic|
+			match.statistiscs.where("'name' LIKE 'review_from_%'").each do |statistic|
 				ret[statistic.user] ||= {}
-				ret[statistic.user][User.find_by_user_name(statistic.name.sub(/^feedback_from_/,''))] = statistic.value
+				ret[statistic.user][User.find_by_user_name(statistic.name.sub(/^review_from_/,''))] = statistic.value
 			end
 			return ret
 		end
 
-		def self.get_feedbacks_missing(match)
+		def self.get_reviews_missing(match)
 			require 'set'
 			ret = Set.new
 
-			feedback = get_feedbacks(match)
+			review = get_reviews(match)
 			users = get_users(match)
 
-			feedback.each do |feedback|
-				(users - feedback.keys).each do |user|
+			review.each do |review|
+				(users - review.keys).each do |user|
 					ret.add(user)
 				end
 			end
diff --git a/lib/scoring/README.md b/lib/scoring/README.md
index dce71d0..efdc3cc 100644
--- a/lib/scoring/README.md
+++ b/lib/scoring/README.md
@@ -4,7 +4,7 @@ Scoring interface
 Files in this directory should be _modules_ implementing the following
 interface:
 
- - `stats_needed(Match) => Array[]=Symbol`
+ - `stats_needed(Match) => Array[]=String`
 
    Returns which statistics need to be collected for this scoring
    algorithm.
diff --git a/lib/scoring/fibonacci_peer_with_blowout.rb b/lib/scoring/fibonacci_peer_with_blowout.rb
index 9d72643..a13d76c 100644
--- a/lib/scoring/fibonacci_peer_with_blowout.rb
+++ b/lib/scoring/fibonacci_peer_with_blowout.rb
@@ -1,15 +1,17 @@
 module Scoring
 	module FibonacciPeerWithBlowout
-		def self.stats_needed
-			return ["votes", "win", "blowout"]
+		def self.stats_needed(match)
+			return ["votes", "win", "blowout"] + match.users.map{|u|"review_from_#{u.user_name}"}
 		end
 
 		def self.score(match)
 			scores = {}
 			match.users.each do |user|
-				stats = Statistic.where(user: user, match: match)
-
-				votes   = stats.where(name: "votes"  ).first.value
+				stats = user.statistics.where(match: match)
+				votes = 0
+				match.users.each do |u|
+					votes += convert_place_to_votes stats.where(name: "review_from_#{u.user_name}").first.value
+				end
 				win     = stats.where(name: "win"    ).first.value
 				blowout = stats.where(name: "blowout").first.value
 				scores[user] = self.score_user(votes, win, blowout)
@@ -23,5 +25,9 @@ module Scoring
 			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
+
+		def self.convert_place_to_votes(place)
+			(place == 0 or place == 1) ? 1 : 0
+		end
 	end
 end
diff --git a/lib/scoring/marginal_peer.rb b/lib/scoring/marginal_peer.rb
index 8559b3d..f2c0272 100644
--- a/lib/scoring/marginal_peer.rb
+++ b/lib/scoring/marginal_peer.rb
@@ -1,6 +1,6 @@
 module Scoring
 	module MarginalPeer
-		def self.stats_needed
+		def self.stats_needed(match)
 			return ["rating", "win"]
 		end
 
diff --git a/lib/scoring/winner_takes_all.rb b/lib/scoring/winner_takes_all.rb
index 9c83fb9..db494c6 100644
--- a/lib/scoring/winner_takes_all.rb
+++ b/lib/scoring/winner_takes_all.rb
@@ -1,15 +1,14 @@
 module Scoring
 	module WinnerTakesAll
-		def self.stats_needed
-			#return ["win"]
-			["win", "numDeaths", "turretsKilled", "championsKilled", "minionsKilled", "assists"]
+		def self.stats_needed(match)
+			return ["win"]
 		end
 
 		def self.score(match)
 			scores = {}
 			match.users.each do |user|
 				stats = Statistic.where(user: user, match: match)
-				scores[user] = score_user(stats.where(name: "win").first.value)
+				scores[user] = score_user(stats.where(name: "win").first)
 			end
 			scores
 		end