diff --git a/app/services/tournament_services/eight_man_double_elimination_generate_loser_names.rb b/app/services/tournament_services/eight_man_double_elimination_generate_loser_names.rb
index c83584c..7b46554 100644
--- a/app/services/tournament_services/eight_man_double_elimination_generate_loser_names.rb
+++ b/app/services/tournament_services/eight_man_double_elimination_generate_loser_names.rb
@@ -18,11 +18,11 @@ class EightManDoubleEliminationGenerateLoserNames
def conso_round_2(matches)
matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match|
if match.bracket_position_number == 1
- match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 4 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
- match.loser2_name = "Loser of #{matches.select{|m| m.bracket_position_number == 3 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
+ match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 1 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
+ match.loser2_name = "Loser of #{matches.select{|m| m.bracket_position_number == 2 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
elsif match.bracket_position_number == 2
- match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 2 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
- match.loser2_name = "Loser of #{matches.select{|m| m.bracket_position_number == 1 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
+ match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 3 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
+ match.loser2_name = "Loser of #{matches.select{|m| m.bracket_position_number == 4 and m.round == 1 and m.bracket_position == "Quarter"}.first.bout_number}"
end
end
end
@@ -30,9 +30,9 @@ class EightManDoubleEliminationGenerateLoserNames
def conso_round_4(matches)
matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match|
if match.bracket_position_number == 1
- match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 1 and m.bracket_position == "Semis"}.first.bout_number}"
- elsif match.bracket_position_number == 2
match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 2 and m.bracket_position == "Semis"}.first.bout_number}"
+ elsif match.bracket_position_number == 2
+ match.loser1_name = "Loser of #{matches.select{|m| m.bracket_position_number == 1 and m.bracket_position == "Semis"}.first.bout_number}"
end
end
end
diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb
index c26b471..c48a265 100644
--- a/app/views/static_pages/about.html.erb
+++ b/app/views/static_pages/about.html.erb
@@ -61,7 +61,7 @@
Double Elimination Information
-Right now, double elimination brackets only support 8 and 16 man brackets (4-16 wrestlers).
+Right now, double elimination brackets only support 8 and 16 man brackets (4-16 wrestlers). Cross bracketing will happen every other round. 16 man in quarter finals, 8 man in semi finals.
Double elimination scoring
- Championship win: 2pt
diff --git a/test/integration/double_elimination_eight_man_match_generation_test.rb b/test/integration/double_elimination_eight_man_match_generation_test.rb
index 69fb004..72df0d1 100644
--- a/test/integration/double_elimination_eight_man_match_generation_test.rb
+++ b/test/integration/double_elimination_eight_man_match_generation_test.rb
@@ -54,8 +54,8 @@ class DoubleEliminationEightManMatchGeneration < ActionDispatch::IntegrationTest
match4 = @tournament.matches.select{|match| match.round == 1 and match.bracket_position_number == 4}.first
assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 1}.first.loser1_name == "BYE"
- assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{match3.bout_number}"
- assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 2}.first.loser1_name == "Loser of #{match2.bout_number}"
+ assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{match2.bout_number}"
+ assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 2}.first.loser1_name == "Loser of #{match3.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "Conso Quarter" && m.bracket_position_number == 2}.first.loser2_name == "BYE"
semis1 = @tournament.matches.select{|match| match.bracket_position == "Semis" and match.bracket_position_number == 1}.first
@@ -63,8 +63,8 @@ class DoubleEliminationEightManMatchGeneration < ActionDispatch::IntegrationTest
consosemis1 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 1}.first
consosemis2 = @tournament.matches.select{|match| match.bracket_position == "Conso Semis" and match.bracket_position_number == 2}.first
- assert consosemis1.loser1_name == "Loser of #{semis1.bout_number}"
- assert consosemis2.loser1_name == "Loser of #{semis2.bout_number}"
+ assert consosemis1.loser1_name == "Loser of #{semis2.bout_number}"
+ assert consosemis2.loser1_name == "Loser of #{semis1.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "5/6" && m.bracket_position_number == 1}.first.loser1_name == "Loser of #{consosemis1.bout_number}"
assert @tournament.matches.select{|m| m.bracket_position == "5/6" && m.bracket_position_number == 1}.first.loser2_name == "Loser of #{consosemis2.bout_number}"
diff --git a/test/integration/double_elimination_run_through_test.rb b/test/integration/double_elimination_run_through_test.rb
index ab53ad1..2a11b57 100644
--- a/test/integration/double_elimination_run_through_test.rb
+++ b/test/integration/double_elimination_run_through_test.rb
@@ -31,17 +31,17 @@ class DoubleEliminationRunThrough < ActionDispatch::IntegrationTest
conso_quarter = matches.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
assert conso_quarter.first.reload.loser1_name == "BYE"
- assert conso_quarter.first.reload.wrestler2.name == "Test6"
- assert conso_quarter.second.reload.wrestler1.name == "Test5"
+ assert conso_quarter.first.reload.wrestler2.name == "Test5"
+ assert conso_quarter.second.reload.wrestler1.name == "Test6"
assert conso_quarter.second.reload.loser2_name == "BYE"
conso_semis = matches.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
- assert conso_semis.first.reload.wrestler1.name == "Test1"
- assert conso_semis.first.reload.wrestler2.name == "Test6"
- assert conso_semis.second.reload.wrestler1.name == "Test3"
- assert conso_semis.second.reload.wrestler2.name == "Test5"
- winner_by_name("Test1",conso_semis.first)
- winner_by_name("Test5",conso_semis.second)
+ assert conso_semis.first.reload.wrestler1.name == "Test3"
+ assert conso_semis.first.reload.wrestler2.name == "Test5"
+ assert conso_semis.second.reload.wrestler1.name == "Test1"
+ assert conso_semis.second.reload.wrestler2.name == "Test6"
+ winner_by_name("Test5",conso_semis.first)
+ winner_by_name("Test1",conso_semis.second)
first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
@@ -50,11 +50,11 @@ class DoubleEliminationRunThrough < ActionDispatch::IntegrationTest
assert first_finals.reload.wrestler1.name == "Test4"
assert first_finals.reload.wrestler2.name == "Test2"
- assert third_finals.reload.wrestler1.name == "Test1"
- assert third_finals.reload.wrestler2.name == "Test5"
+ assert third_finals.reload.wrestler1.name == "Test5"
+ assert third_finals.reload.wrestler2.name == "Test1"
- assert fifth_finals.reload.wrestler1.name == "Test6"
- assert fifth_finals.reload.wrestler2.name == "Test3"
+ assert fifth_finals.reload.wrestler1.name == "Test3"
+ assert fifth_finals.reload.wrestler2.name == "Test6"
# DEBUG
# matches.sort_by{|m| m.bout_number}.each do |match|