summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-28 10:00:47 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-28 10:00:47 -0400
commita75bd55c2cd3d8b53f61aa8d700fc510c8308f57 (patch)
tree2c8c7dae85bdaa45f7100598b8d951983d49552a
parentffa2652ec2b251818328e8927b112dde9e45de80 (diff)
remove dead references to {Tournament,Game}#sampling_method
-rw-r--r--app/controllers/tournaments_controller.rb1
-rw-r--r--app/models/tournament.rb4
-rw-r--r--app/models/tournament_stage.rb4
3 files changed, 0 insertions, 9 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 0947ac8..471c5da 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -191,7 +191,6 @@ class TournamentsController < ApplicationController
p[:max_players_per_team] ||= game.max_players_per_team
p[:min_teams_per_match] ||= game.min_teams_per_match
p[:max_teams_per_match] ||= game.max_teams_per_match
- p[:sampling_method] ||= game.sampling_method
p[:scoring_method] ||= game.scoring_method
end
return p
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 46a2ba7..b867716 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -100,10 +100,6 @@ class Tournament < ActiveRecord::Base
@scoring ||= "Scoring::#{self.scoring_method.camelcase}".constantize
end
- def sampling
- @sampling ||= "Sampling::#{self.sampling_method.camelcase}".constantize
- end
-
# YISSSSSS
def scoring_methods
diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
index caf5a8a..19b9c23 100644
--- a/app/models/tournament_stage.rb
+++ b/app/models/tournament_stage.rb
@@ -31,10 +31,6 @@ class TournamentStage < ActiveRecord::Base
@scoring ||= tournament.scoring
end
- def sampling
- @sampling ||= tournament.sampling
- end
-
def scheduling
@scheduling ||= "Scheduling::#{self.scheduling_method.camelcase}".constantize.new(self)
end