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

Conflicts:
	app/views/matches/show.html.erb

2 files changed, 33 insertions, 8 deletions

diff --git a/lib/scheduling/elimination.rb b/lib/scheduling/elimination.rb
index 0e93f7a..543df52 100644
--- a/lib/scheduling/elimination.rb
+++ b/lib/scheduling/elimination.rb
@@ -7,14 +7,6 @@ module Scheduling
 			@tournament_stage = tournament_stage
 		end
 
-		def tournament_stage
-			@tournament_stage
-		end
-
-		def tournament
-			self.tournament_stage.tournament
-		end
-
 		def create_matches
 			num_teams = (self.tournament.players.count/self.tournament.min_players_per_team).floor
 			num_matches = (Float(num_teams -  tournament.min_teams_per_match)/(tournament.min_teams_per_match - 1)).ceil + 1
@@ -138,5 +130,14 @@ STRING
 			return str
 		end
 
+		private
+
+		def tournament_stage
+			@tournament_stage
+		end
+
+		def tournament
+			self.tournament_stage.tournament
+		end
 	end
 end
diff --git a/lib/scheduling/roundrobin.rb b/lib/scheduling/roundrobin.rb
new file mode 100644
index 0000000..e050c41
--- /dev/null
+++ b/lib/scheduling/roundrobin.rb
@@ -0,0 +1,24 @@
+
+module Scheduling
+	class RoundRobin
+		include Rails.application.routes.url_helpers
+
+		def initialize(tournament_stage)
+			@tournament_stage = tournament_stage
+		end
+
+		def create_matches
+			num_teams = (self.tournament.players.count/self.tournament.min_players_per_team).floor
+			num_matches = Float(num_teams/2)*(num_teams-1)
+
+		end
+
+		def match_finished(match)
+			
+		end
+
+		def graph(current_user)
+			
+		end
+	end
+end