cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-25 15:31:39 +00:00
Code Issues Releases Wiki Activity

Simplify construction a bit on some methods

Browse Source
This commit is contained in:
R.J. Osborne
2015-05-19 22:36:30 -04:00
parent 80dee9c234
commit 0e954c1789
3 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/pool.rb
View File

@@ -3,7 +3,7 @@ class Pool
@pools = weight.pools @pools = weight.pools
@pool = 1 @pool = 1
while @pool <= @pools while @pool <= @pools
matches = roundRobin(weight.wrestlers, weight, tournament , matches) matches = roundRobin(weight.wrestlers, weight, tournament, matches)
@pool += 1 @pool += 1
end end
return matches return matches
@@ -12,19 +12,16 @@ class Pool
def roundRobin(wrestlers,weight,tournament,matches) def roundRobin(wrestlers,weight,tournament,matches)
@wrestlers = wrestlers.select{|w| w.generatePoolNumber == @pool}.to_a @wrestlers = wrestlers.select{|w| w.generatePoolNumber == @pool}.to_a
@poolMatches = RoundRobinTournament.schedule(@wrestlers).reverse @poolMatches = RoundRobinTournament.schedule(@wrestlers).reverse
@poolMatches.each_with_index do |b,index| @poolMatches.each_with_index do |b, index|
round = index + 1
@bout = b.map @bout = b.map
@bout.each do |bout| @bout.each do |bout|
if bout[0] != nil and bout[1] != nil if bout[0] != nil and bout[1] != nil
@match = Match.new @match = Match.new(w1: bout[0].id, w2: bout[1].id, weight_id: weight.id, round: round)
@match.w1 = bout[0].id
@match.w2 = bout[1].id
@match.weight_id = weight.id
@match.round = index + 1
matches << @match matches << @match
end end
end end
end end
return matches matches
end end
end end

1
app/models/wrestler.rb
View File

@@ -19,7 +19,6 @@ class Wrestler < ActiveRecord::Base
def generatePoolNumber def generatePoolNumber
@pool = self.weight.returnPoolNumber(self) @pool = self.weight.returnPoolNumber(self)
return @pool
end end
def boutByRound(round,matches) def boutByRound(round,matches)

27
test/integration/poolbracket_matchups_test.rb
View File

@@ -7,7 +7,6 @@ class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest
end end
def createTournament(numberOfWrestlers) def createTournament(numberOfWrestlers)
@count = 1
@id = 6000 + numberOfWrestlers @id = 6000 + numberOfWrestlers
@tournament3 = Tournament.new @tournament3 = Tournament.new
@tournament3.id = @id @tournament3.id = @id
@@ -26,17 +25,18 @@ class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest
@weight3.id = @id @weight3.id = @id
@weight3.tournament_id = @id @weight3.tournament_id = @id
@weight3.save @weight3.save
until @count > numberOfWrestlers do numberOfWrestlers.times do |x|
@wrestler2 = Wrestler.new count = x + 1
@wrestler2.name = "Guy #{@count}" @wrestler2 = Wrestler.new(
@wrestler2.school_id = @id name: "Guy #{count}",
@wrestler2.weight_id = @id school_id: @id,
@wrestler2.original_seed = @count weight_id: @id,
@wrestler2.season_loss = 0 original_seed: count,
@wrestler2.season_win = 0 season_loss: 0,
@wrestler2.criteria = nil season_win: 0,
criteria: nil
)
@wrestler2.save @wrestler2.save
@count = @count + 1
end end
return @tournament3 return @tournament3
end end
@@ -61,11 +61,6 @@ class PoolbracketMatchupsTest < ActionDispatch::IntegrationTest
end end
end end
test "the truth" do
assert true
end
test "found tournament" do test "found tournament" do
refute_nil @tournament refute_nil @tournament
end end