From 20f9b7f0164e8aac92019e14260327edff8daa16 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Mon, 23 Mar 2015 11:59:56 +0000
Subject: [PATCH] Cleaned up a little bit of code

---
 app/models/tournament.rb |  2 +-
 app/models/weight.rb     | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 6dff6ff..bcff179 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -5,7 +5,7 @@ class Tournament < ActiveRecord::Base
 	has_many :mats, dependent: :destroy	
 	attr_accessor :upcomingMatches, :unfinishedMatches
 
-	def self.unfinishedMatches
+	def unfinishedMatches
 		
 	end
 
diff --git a/app/models/weight.rb b/app/models/weight.rb
index d3bae91..79c479b 100644
--- a/app/models/weight.rb
+++ b/app/models/weight.rb
@@ -102,16 +102,8 @@ class Weight < ActiveRecord::Base
 
 	def generateMatchups(matches)
 		@wrestlers = self.wrestlers
-		if self.pools == 1
-			@pool = Pool.new
-			@matches = @pool.generatePools(1,@wrestlers,self,self.tournament_id,matches)
-		elsif self.pools == 2
-			@pool = Pool.new
-			@matches = @pool.generatePools(2,@wrestlers,self,self.tournament_id,matches)
-		elsif self.pools == 4
-			@pool = Pool.new
-			@matches = @pool.generatePools(4,@wrestlers,self,self.tournament_id,matches)
-		end
+		@pool = Pool.new
+		@matches = @pool.generatePools(self.pools,@wrestlers,self,self.tournament_id,matches)
 		return @matches
 	end