diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 00:04:47 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 00:04:47 -0400 |
| commit | 6b66877bda4c0e4a33bb3109304636d5ada85904 (patch) | |
| tree | 7065307802fec8452afc89c8a7b445fd2ceca772 /lib | |
| parent | 33fcf6de9feaaa6f90dfe5082e08d280c930dae1 (diff) | |
| parent | 7a4832621f1a0bb2e4b86ee9f879a73df0188a3e (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sampling/README.md | 2 | ||||
| -rw-r--r-- | lib/sampling/peer_review.rb | 2 | ||||
| -rw-r--r-- | lib/seeding/early_bird_seeding.rb | 2 | ||||
| -rw-r--r-- | lib/seeding/fair_ranked_seeding.rb | 5 | ||||
| -rw-r--r-- | lib/seeding/random_seeding.rb | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/lib/sampling/README.md b/lib/sampling/README.md index 5e0a53c..e4b3fbf 100644 --- a/lib/sampling/README.md +++ b/lib/sampling/README.md @@ -11,7 +11,7 @@ interface: - `self.can_get?(String setting_name) => Fixnum` - Returns whether or nat this sampling method can get a specifed + Returns whether or not this sampling method can get a specifed statistic; 0 means 'false', positive integers mean 'true', where higher numbers are higher priority. diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb index dd456c9..4577542 100644 --- a/lib/sampling/peer_review.rb +++ b/lib/sampling/peer_review.rb @@ -86,6 +86,6 @@ module Sampling end return ret - endx + end end end diff --git a/lib/seeding/early_bird_seeding.rb b/lib/seeding/early_bird_seeding.rb index 488a1a2..5c289ed 100644 --- a/lib/seeding/early_bird_seeding.rb +++ b/lib/seeding/early_bird_seeding.rb @@ -7,7 +7,7 @@ module Seeding teams = 0 tournament.players.each_slice(tournament.min_players_per_team) do |slice| if teams < tournament.min_teams_per_match - match.teams[teams].players += slice + match.teams.push Team.create(players: slice) teams += 1 else match_num += 1 diff --git a/lib/seeding/fair_ranked_seeding.rb b/lib/seeding/fair_ranked_seeding.rb index f56d648..870ebdd 100644 --- a/lib/seeding/fair_ranked_seeding.rb +++ b/lib/seeding/fair_ranked_seeding.rb @@ -5,6 +5,9 @@ module Seeding match = matches.first match_num = 0 players_used = 0 + (tournament.players.count/tournament.min_players_per_team).floor.times do + match.teams.push Team.create() + end best_first(tournament).each_slice(tournament.min_teams_per_match) do |slice| (0..tournament.min_teams_per_match-1).each do |index| match.teams[index].players += slice[index] @@ -30,7 +33,7 @@ module Seeding end def self.previous_score(player, tournament) - score = tournament.statistics.getStatistic(player.matches.last, player, :score) + score = tournament.statistics.where(match: player.matches.last, user: player, name: :score) if score.nil? return 0 end diff --git a/lib/seeding/random_seeding.rb b/lib/seeding/random_seeding.rb index 723d70e..36e06d6 100644 --- a/lib/seeding/random_seeding.rb +++ b/lib/seeding/random_seeding.rb @@ -7,7 +7,7 @@ module Seeding teams = 0 tournament.players.shuffle.each_slice(tournament.min_players_per_team) do |slice| if teams < tournament.min_teams_per_match - match.teams[teams].players += slice + match.teams.push Team.create(players: slice) teams += 1 else match_num += 1 |