From 7deb9c1c7acadf9a5b638313f51ba9dc60624672 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 22 Apr 2014 18:17:13 -0400
Subject: made naming conventions consistent

---
 lib/scoring/FibonacciPeerWithBlowout.rb    | 16 ----------------
 lib/scoring/MarginalPeer.rb                | 15 ---------------
 lib/scoring/ScoringAlgorithm.rb            |  8 --------
 lib/scoring/WinnerTakesAll.rb              | 16 ----------------
 lib/scoring/fibonacci_peer_with_blowout.rb | 16 ++++++++++++++++
 lib/scoring/marginal_peer.rb               | 15 +++++++++++++++
 lib/scoring/scoring_algorithm.rb           |  8 ++++++++
 lib/scoring/winner_takes_all.rb            | 16 ++++++++++++++++
 8 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 lib/scoring/FibonacciPeerWithBlowout.rb
 delete mode 100644 lib/scoring/MarginalPeer.rb
 delete mode 100644 lib/scoring/ScoringAlgorithm.rb
 delete mode 100644 lib/scoring/WinnerTakesAll.rb
 create mode 100644 lib/scoring/fibonacci_peer_with_blowout.rb
 create mode 100644 lib/scoring/marginal_peer.rb
 create mode 100644 lib/scoring/scoring_algorithm.rb
 create mode 100644 lib/scoring/winner_takes_all.rb

(limited to 'lib/scoring')

diff --git a/lib/scoring/FibonacciPeerWithBlowout.rb b/lib/scoring/FibonacciPeerWithBlowout.rb
deleted file mode 100644
index 19ac9a7..0000000
--- a/lib/scoring/FibonacciPeerWithBlowout.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-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
diff --git a/lib/scoring/MarginalPeer.rb b/lib/scoring/MarginalPeer.rb
deleted file mode 100644
index 0e1cfa8..0000000
--- a/lib/scoring/MarginalPeer.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'ScoringAlgorithm'
-
-class MarginalPeer < ScoringAlgorithm
-
-	def self.score(match, interface)
-		match.players.each do |player|
-			scores[player.user_name] = scoreUser(interface.getStatistic(match, player, rating))
-		end
-		scores
-	end
-
-	def self.score(rating)
-		rating
-	end
-end
\ No newline at end of file
diff --git a/lib/scoring/ScoringAlgorithm.rb b/lib/scoring/ScoringAlgorithm.rb
deleted file mode 100644
index 6277da8..0000000
--- a/lib/scoring/ScoringAlgorithm.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Leaguer
-	module Scoring
-		class ScoringAlgorithm
-			def self.score(match, interface)
-			end
-		end
-	end
-end
\ No newline at end of file
diff --git a/lib/scoring/WinnerTakesAll.rb b/lib/scoring/WinnerTakesAll.rb
deleted file mode 100644
index ad2471b..0000000
--- a/lib/scoring/WinnerTakesAll.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'ScoringAlgorithm'
-
-class WinnerTakesAll < ScoringAlgorithm
-
-	def self.score(match, interface)
-		match.players.each do |player|
-			scores[player.user_name] = scoreUser(match.win?(player))
-		end
-		scores
-	end
-
-
-	def self.score(win)
-		win.nil? ? 0.5 : win ? 1 : 0
-	end
-end
\ No newline at end of file
diff --git a/lib/scoring/fibonacci_peer_with_blowout.rb b/lib/scoring/fibonacci_peer_with_blowout.rb
new file mode 100644
index 0000000..19ac9a7
--- /dev/null
+++ b/lib/scoring/fibonacci_peer_with_blowout.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
diff --git a/lib/scoring/marginal_peer.rb b/lib/scoring/marginal_peer.rb
new file mode 100644
index 0000000..0e1cfa8
--- /dev/null
+++ b/lib/scoring/marginal_peer.rb
@@ -0,0 +1,15 @@
+require 'ScoringAlgorithm'
+
+class MarginalPeer < ScoringAlgorithm
+
+	def self.score(match, interface)
+		match.players.each do |player|
+			scores[player.user_name] = scoreUser(interface.getStatistic(match, player, rating))
+		end
+		scores
+	end
+
+	def self.score(rating)
+		rating
+	end
+end
\ No newline at end of file
diff --git a/lib/scoring/scoring_algorithm.rb b/lib/scoring/scoring_algorithm.rb
new file mode 100644
index 0000000..6277da8
--- /dev/null
+++ b/lib/scoring/scoring_algorithm.rb
@@ -0,0 +1,8 @@
+module Leaguer
+	module Scoring
+		class ScoringAlgorithm
+			def self.score(match, interface)
+			end
+		end
+	end
+end
\ No newline at end of file
diff --git a/lib/scoring/winner_takes_all.rb b/lib/scoring/winner_takes_all.rb
new file mode 100644
index 0000000..ad2471b
--- /dev/null
+++ b/lib/scoring/winner_takes_all.rb
@@ -0,0 +1,16 @@
+require 'ScoringAlgorithm'
+
+class WinnerTakesAll < ScoringAlgorithm
+
+	def self.score(match, interface)
+		match.players.each do |player|
+			scores[player.user_name] = scoreUser(match.win?(player))
+		end
+		scores
+	end
+
+
+	def self.score(win)
+		win.nil? ? 0.5 : win ? 1 : 0
+	end
+end
\ No newline at end of file
-- 
cgit v1.2.3-2-g168b