From 399923b94979d97b2842c98ab8c380a75155019e Mon Sep 17 00:00:00 2001
From: RJ Osborne <rjo1970@gmail.com>
Date: Sat, 23 May 2015 06:01:15 -0400
Subject: [PATCH] removed the matches argument to generatePools and roundRobin

---
 app/models/pool.rb               | 12 +++++++-----
 app/models/tournamentmatchgen.rb |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/models/pool.rb b/app/models/pool.rb
index cc6cb98..6bf15f4 100644
--- a/app/models/pool.rb
+++ b/app/models/pool.rb
@@ -1,15 +1,17 @@
 class Pool
-	def generatePools(weight, tournament, matches)
+	def generatePools(weight, tournament)
+		matches = []
 		@pools = weight.pools
 		@pool = 1
 		while @pool <= @pools
-			matches = roundRobin(weight.wrestlers, weight, tournament, matches)
+			matches += roundRobin(weight.wrestlers, weight, tournament)
 			@pool += 1
 		end
 		return matches
 	end
 
-	def roundRobin(wrestlers,weight,tournament,matches)
+	def roundRobin(wrestlers,weight,tournament)
+		matches = []
 		@wrestlers = wrestlers.select{|w| w.generatePoolNumber == @pool}.to_a
 		@poolMatches = RoundRobinTournament.schedule(@wrestlers).reverse
 		@poolMatches.each_with_index do |b, index|
@@ -17,8 +19,8 @@ class Pool
 			@bout = b.map
 			@bout.each do |bout|
 				if bout[0] != nil and bout[1] != nil
-					@match = Match.new(w1: bout[0].id, w2: bout[1].id, weight_id: weight.id, round: round)
-					matches << @match
+					match = Match.new(w1: bout[0].id, w2: bout[1].id, weight_id: weight.id, round: round)
+					matches << match
 				end
 			end
 		end
diff --git a/app/models/tournamentmatchgen.rb b/app/models/tournamentmatchgen.rb
index a26810e..c418e32 100644
--- a/app/models/tournamentmatchgen.rb
+++ b/app/models/tournamentmatchgen.rb
@@ -27,11 +27,11 @@ class Tournamentmatchgen
 
   def buildTournamentWeights
     @tournament.weights.sort_by{|x|[x.max]}.each do |weight|
-      @matches = Pool.new.generatePools(weight, @tournament.id, @matches)
-      weight_matches = @matches.select{|m| m.weight_id == weight.id }
+      matches = Pool.new.generatePools(weight, @tournament.id)
+      weight_matches = matches.select{|m| m.weight_id == weight.id }
       last_match = weight_matches.sort_by{|m| m.round}.last
       highest_round = last_match.round
-      @matches = Poolbracket.new.generateBracketMatches(@matches, weight, highest_round)
+      @matches += Poolbracket.new.generateBracketMatches(matches, weight, highest_round)
     end
   end