tournament 2.3.0 → 2.4.0

data/History.txt

@@ -1,3 +1,6 @@
+== 2.4.0 / 2009-03-23
+* Hook up possibility report.
+
 == 2.3.0 / 2009-03-20
 * Add ability for admin to send emails to participants.  Needs work.
 

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/tournament.rb
 lib/tournament/bracket.rb
 lib/tournament/entry.rb
 lib/tournament/pool.rb
+lib/tournament/possibility.rb
 lib/tournament/scoring_strategy.rb
 lib/tournament/team.rb
 lib/tournament/webgui_installer.rb
@@ -73,6 +74,7 @@ webgui/app/views/layouts/print.html.erb
 webgui/app/views/layouts/report.html.erb
 webgui/app/views/pool/index.html.erb
 webgui/app/views/reports/_leader.html.erb
+webgui/app/views/reports/_possibility.html.erb
 webgui/app/views/reports/_report.html.erb
 webgui/app/views/reports/show.html.erb
 webgui/app/views/sessions/new.html.erb

data/Rakefile

@@ -20,7 +20,7 @@ PROJ.authors = 'Douglas A. Seifert'
 PROJ.email = 'doug+rubyforge@dseifert.net'
 PROJ.url = 'http://www.dseifert.net/code/tournament'
 PROJ.rubyforge.name = 'tournament'
-PROJ.version = '2.3.0'
+PROJ.version = '2.4.0'
 PROJ.group_id = 5863
 
 PROJ.spec.opts << '--color'

data/lib/tournament/pool.rb

@@ -588,14 +588,20 @@ class Tournament::Pool
     nil
   end
 
-  # Runs through every possible outcome of the tournament and calculates
-  # each entry's chance to win as a percentage of the possible outcomes
-  # the entry would win if the tournament came out that way.
-  def possibility_report(out = $stdout)
-    $stdout.sync = true
-    if @entries.size == 0
-      out << "There are no entries in the pool." << "\n"
-      return
+  # Runs through every possible outcome of the tournament and
+  # calculates each entry's chance to win as a percentage of the
+  # possible outcomes the entry would win if the tournment came
+  # out that way.  If a block is provided, periodically reports
+  # progress by calling the block and passing it the percent complete
+  # and time remaining in seconds as arguments.
+  # Returns array of structs responding to times_champ, max_score,
+  # min_rank, entry and champs methods.  The entry method returns the
+  # Tournament::Entry object and the champs method returns a hash
+  # keyed on team name and whose values are the number of times that
+  # team could win that would make the entry come in on top.
+  def possibility_stats
+    stats = @entries.map do |e|
+      Tournament::Possibility.new(e)
     end
     max_possible_score = @entries.map{|p| 0}
     min_ranking = @entries.map{|p| @entries.size + 1}
@@ -604,19 +610,20 @@ class Tournament::Pool
     count = 0
     old_percentage = -1 
     old_remaining = 1_000_000_000_000
-    out << "Checking #{self.tournament_entry.picks.number_of_outcomes} possible outcomes" << "\n"
     start = Time.now.to_f
     self.tournament_entry.picks.each_possible_bracket do |poss|
       poss_scores = @entries.map{|p| p.picks.score_against(poss, self.scoring_strategy)}
       sort_scores = poss_scores.sort.reverse
       @entries.each_with_index do |entry, i|
         score = poss_scores[i]
-        max_possible_score[i] = score if score > max_possible_score[i]
+        stat = stats[i]
+        stat.max_score = score if score > stat.max_score
         rank = sort_scores.index(score) + 1
-        min_ranking[i] = rank if rank < min_ranking[i]
-        times_winner[i] += 1 if rank == 1
+        stat.min_rank = rank if rank < stat.min_rank
+        stat.times_champ += 1 if rank == 1
         if rank == 1
-          player_champions[i][poss.champion] += 1
+          stat.champs[poss.champion.name] ||= 0
+          stat.champs[poss.champion.name] += 1
         end
       end
       count += 1
@@ -627,42 +634,55 @@ class Tournament::Pool
       if (percentage.to_i != old_percentage) || (remaining < old_remaining)
         old_remaining = remaining
         old_percentage = percentage.to_i
-        hashes = '#' * (percentage.to_i/5) + '>'
-        out << "\rCalculating: %3d%% +#{hashes.ljust(20, '-')}+ %5d seconds remaining" % [percentage.to_i, remaining]
+        if block_given?
+          yield(percentage.to_i, remaining)
+        end
       end
     end
+    stats.sort!
+    return stats
+  end
+
+  # Runs through every possible outcome of the tournament and calculates
+  # each entry's chance to win as a percentage of the possible outcomes
+  # the entry would win if the tournament came out that way.  Generates
+  # an ASCII report of the results.
+  def possibility_report(out = $stdout)
+    $stdout.sync = true
+    if @entries.size == 0
+      out << "There are no entries in the pool." << "\n"
+      return
+    end
+    out << "Checking #{self.tournament_entry.picks.number_of_outcomes} possible outcomes" << "\n"
+    stats = possibility_stats do |percentage, remaining|
+      hashes = '#' * (percentage.to_i/5) + '>'
+      out << "\rCalculating: %3d%% +#{hashes.ljust(20, '-')}+ %5d seconds remaining" % [percentage.to_i, remaining]
+    end
     out << "\n"
-    #puts "\n   Max Scores: #{max_possible_score.inspect}"
-    #puts "Highest Place: #{min_ranking.inspect}"
-    #puts " Times Winner: #{times_winner.inspect}"
-    sort_array = []
-    times_winner.each_with_index { |n, i| sort_array << [n, i, min_ranking[i], max_possible_score[i], player_champions[i]] }
-    sort_array = sort_array.sort_by {|arr| arr[0] == 0 ? (arr[2] == 0 ? -arr[3] : arr[2]) : -arr[0]}
-    #puts "SORT: #{sort_array.inspect}"
+    #puts "SORT: #{stats.inspect}"
     out << "    Entry           | Win Chance | Highest Place | Curr Score | Max Score | Tie Break  " << "\n"
     out << "--------------------+------------+---------------+------------+-----------+------------" << "\n"
-    sort_array.each do |arr|
-      chance = arr[0].to_f * 100.0 / self.tournament_entry.picks.number_of_outcomes
+    stats.each do |stat|
+      chance = stat.times_champ.to_f * 100.0 / self.tournament_entry.picks.number_of_outcomes
       out << "%19s | %10.2f | %13d | %10d | %9d | %7d " %
-        [@entries[arr[1]].name, chance, min_ranking[arr[1]], @entries[arr[1]].picks.score_against(self.tournament_entry.picks, self.scoring_strategy), max_possible_score[arr[1]], @entries[arr[1]].tie_breaker] << "\n"
+        [stat.entry.name, chance, stat.min_rank, stat.entry.picks.score_against(self.tournament_entry.picks, self.scoring_strategy), stat.max_score, stat.entry.tie_breaker] << "\n"
     end
     out << "Possible Champions For Win" << "\n"
     out << "    Entry           |    Champion     |  Ocurrences   |  Chance " << "\n"
     out << "--------------------+-----------------+---------------+---------" << "\n"
-    sort_array.each do |arr|
-      next if arr[4].size == 0
-      arr[4].sort_by{|k,v| -v}.each_with_index do |harr, idx| 
+    stats.each do |stat|
+      next if stat.champs.size == 0
+      stat.champs.sort_by{|k,v| -v}.each_with_index do |harr, idx| 
         team = harr[0]
         occurences = harr[1]
         if idx == 0
-          out << "%19s | %15s | %13d | %8.2f " % [@entries[arr[1]].name, team.name, occurences, occurences.to_f * 100.0 / arr[0]] << "\n"
+          out << "%19s | %15s | %13d | %8.2f " % [stat.entry.name, team, occurences, occurences.to_f * 100.0 / stat.times_champ] << "\n"
         else
-          out << "%19s | %15s | %13d | %8.2f " % ['', team.name, occurences, occurences.to_f * 100.0 / arr[0]] << "\n"
+          out << "%19s | %15s | %13d | %8.2f " % ['', team, occurences, occurences.to_f * 100.0 / stat.times_champ] << "\n"
         end
       end
       out << "--------------------+-----------------+---------------+---------" << "\n"
     end
     nil
   end
-
 end

data/lib/tournament/possibility.rb

@@ -0,0 +1,19 @@
+# Holds information about an Tournament::Entry's possibilities for
+# remaining games in a tournament.
+class Tournament::Possibility
+  include Comparable
+  attr_accessor :times_champ, :max_score, :min_rank
+  attr_reader :champs, :entry
+  def initialize(entry)
+    @times_champ = 0
+    @max_score = 0
+    @min_rank = 1_000_000_000
+    @champs = {}
+    @entry = entry
+  end
+  def <=>(other)
+    (other.times_champ <=> self.times_champ).nonzero? ||
+      (self.min_rank <=> other.min_rank).nonzero? ||
+      other.max_score <=> self.max_score
+  end
+end

data/webgui/app/controllers/admin_controller.rb

@@ -31,9 +31,10 @@ class AdminController < ApplicationController
   end
 
   def recap
+    @pool = Pool.find(params[:id])
     if request.post?
       begin
-        UserMailer.deliver_recap(User.find(:all) - [current_user], params[:subject], params[:content], root_path(:only_path => false))
+        UserMailer.deliver_recap(@pool.entrants, params[:subject], params[:content], root_path(:only_path => false))
         flash[:notice] = "Email was delivered."
       rescue Exception => e
         flash[:error] = "Email could not be delivered: #{e}"

data/webgui/app/controllers/entry_controller.rb

@@ -1,21 +1,25 @@
 class EntryController < ApplicationController
   layout 'bracket'
   before_filter :login_required
-  before_filter :check_access, :only => [:show, :edit, :print, :pdf]
+  before_filter :resolve_entry, :only => [:edit, :show, :print, :pdf]
+  before_filter :check_access, :only => [:edit]
   before_filter :pool_taking_edits, :only => [:edit]
   include SavesPicks
   include PdfHelper
 
-  def check_access
+  def resolve_entry
     # Resolve the entry
     @entry = params[:id] ? Entry.find(params[:id]) : Entry.new({:user_id => current_user.id, :pool_id => params[:pool_id]})
+  end
 
+  def check_access
     # Admin user
     return true if current_user.has_role?(:admin)
 
     # Check if entry being viewed belongs to current user
     if current_user != @entry.user
-      flash[:info] = "You don't have access to that entry."
+      flash[:info] = "You can't make edits to that entry.  This has been reported to the pool administrator."
+      logger.warn("User #{current_user.login} tried to edit entry #{@entry.id}")
       redirect_to root_path
       return false
     end
@@ -62,6 +66,7 @@ class EntryController < ApplicationController
   end
 
   def edit
+    @pool = @entry.pool.pool
     if params[:reset] == 'Reset Picks'
       @entry.reset
       if @entry.new_record?

data/webgui/app/controllers/reports_controller.rb

@@ -1,7 +1,61 @@
 class ReportsController < ApplicationController
+  STATS_DATAFILE = File.expand_path(File.join(RAILS_ROOT, 'db', 'stats.yml')) unless defined?(STATS_DATAFILE)
   layout 'report'
   def show
     @pool = Pool.find(params[:id])
+    if params[:report] == 'possibility'
+      possibility
+    end
+  end
+
+  def possibility
+    if !File.exist?(STATS_DATAFILE)
+      @message = "The statistics data has not yet been generated.  Please try again later or send an email to #{ADMIN_EMAIL}."
+      @stats = []
+    else
+      @stats = YAML.load_file(STATS_DATAFILE)
+    end
+  end
+
+  def gen_possibility
+    @pool = Pool.find(params[:id])
+    pool = @pool.pool
+    reporter = Proc.new do |response, output|
+      output.write "Starting to generate possibility statistics for #{pool.tournament_entry.picks.number_of_outcomes} possible outcomes...<br/>\n"
+      output.flush
+      stats_thread = Thread.new do
+        begin
+          Thread.current[:stats] = pool.possibility_stats do |percentage, remaining|
+            Thread.current[:percentage] = percentage
+            Thread.current[:remaining] = remaining
+          end
+        rescue Exception => e
+          Thread.current[:error] = e
+          Thread.current[:percentage] = 100
+        end
+      end
+
+      while stats_thread[:percentage].nil? || stats_thread[:percentage] < 100
+        logger.info "   -> #{stats_thread[:percentage] || 'UNK'}% Complete #{stats_thread[:remaining] || 'UNK'}s remaining ... "
+        output.write "   -> #{stats_thread[:percentage] || 'UNK'}% Complete #{stats_thread[:remaining] || 'UNK'}s remaining ... <br/>"
+        output.flush
+        sleep 10
+      end
+
+      output.write "Waiting for thread to end ..."
+      stats_thread.join
+
+      if stats_thread[:error]
+        output.write "Got error #{stats_thread[:error]}"
+        output.write "<br/>"
+        output.flush
+      else
+        data = stats_thread[:stats]
+        File.open(STATS_DATAFILE, "w") {|f| f.write YAML.dump(data)}
+        output.write "Generated file!"
+      end
+    end
+    render :text => reporter
   end
 
 end

data/webgui/app/models/pool.rb

@@ -7,6 +7,7 @@ class Pool < ActiveRecord::Base
   belongs_to :user
   has_many :entries
   has_many :user_entries, :class_name => 'Entry', :conditions => ['user_id != ?', '#{user_id}']
+  has_many :users, :through => :user_entries
   has_many :pending_entries, :class_name => 'Entry', :conditions => ['completed = ? and user_id != ?', false, '#{user_id}']
   has_one :tournament_entry, :class_name => 'Entry', :conditions => {:user_id => '#{user_id}'}
   has_many :seedings
@@ -29,6 +30,11 @@ class Pool < ActiveRecord::Base
     end
   end
 
+  # entrants: the unique set of users having entries in this pool
+  def entrants
+    self.users.uniq
+  end
+
   # True if the number of teams in the pool is 64
   def ready?
     return teams.size == 64

data/webgui/app/views/admin/recap.html.erb

@@ -1,4 +1,5 @@
 <h1>Send a Recap Email</h1>
+<h3><%=@pool.name%></h3>
 <form action="<%=url_for :action => 'recap'%>" method="POST">
 <table border="0">
 <tr>

data/webgui/app/views/pool/index.html.erb

@@ -6,22 +6,26 @@
 <span class="poollisthead"><%= pool.name %></span>
 <small>
 <% if current_user && pool.user_id == current_user.id %>
-&nbsp;
-<%= link_to '[Bracket]', :controller => 'admin', :action => 'bracket', :id => pool.id %>
-<%= link_to '[Recap]', :controller => 'admin', :action => 'recap'%>
+<%= link_to '[Tourny Bracket]', :controller => 'admin', :action => 'bracket', :id => pool.tournament_entry.id %>
+<%= link_to '[Recap]', :controller => 'admin', :action => 'recap', :id => pool.id%>
 <%= link_to '[Edit]', :controller => 'admin', :action => 'pool', :id => pool.id %>
 <%= link_to '[Entries]', :controller => 'admin', :action => 'entries', :id => pool.id %>
+<% else %>
+<%= link_to '[Tourny Bracket]', :controller => 'entry', :action => 'show', :id => pool.tournament_entry.id %>
 <% end %>
 <%= link_to '[Leader Board]', :controller => 'reports', :action => 'show', :id => pool.id, :report => 'leader' %>
 <%= link_to '[Reports]', :controller => 'reports', :action => 'show', :id => pool.id %>
 </small>
 <div class="poollistinfo">
 <div class="poollistinfodetail">
-Starts: <%= pool.starts_at.to_date.to_formatted_s(:long)%>
+<% if pool.starts_at < Time.zone.now %>Started<%else%>Starts<%end%>: <%= pool.starts_at.to_formatted_s(:long)%>
 Pending Entries: <%= pool.pending_entries.size%>
 Total Entries: <%= pool.user_entries.size%>
 </div>
 <div class="poollistinfodetail">
+Last Update: <%=pool.updated_at.to_formatted_s(:long)%>
+</div>
+<div class="poollistinfodetail">
 Entry Fee: $<%=pool.fee%>
 </div>
 <div class="poollistinfodetail">

data/webgui/app/views/reports/_leader.html.erb

@@ -35,6 +35,7 @@
 </thead>
 <tbody>
 <%
+  db_entry_ids = @pool.user_entries.inject({}) {|h,e| h[e.name] = e.id; h}
   pool.entries.sort do |e1, e2|
     s1 = e1.picks.score_against(pool.tournament_entry.picks, pool.scoring_strategy)
     s2 = e2.picks.score_against(pool.tournament_entry.picks, pool.scoring_strategy)
@@ -63,7 +64,7 @@
 <td><%=rank_display%></td>
 <td><%=total%></td>
 <td><%=max%></td>
-<td><%=entry.name%></td>
+<td><%=link_to entry.name, :controller => 'entry', :action => 'show', :id => db_entry_ids[entry.name]%></td>
 <td><%=champ.short_name%> <%=pool.tournament_entry.picks.still_alive?(champ) ? 'Y' : 'N'%></td>
 <td><%=entry.tie_breaker || '-'%></td>
 <% round_scores.each do |rs| %>

data/webgui/app/views/reports/_possibility.html.erb

@@ -0,0 +1,45 @@
+<% show_header = defined?(show_header) ? show_header : true %>
+<% if show_header %>
+<h1>Possibility Report</h1>
+<ul>
+<li>Total games played: <%= pool.tournament_entry.picks.games_played %></li>
+<li>Pool Tie Break: <%=pool.tournament_entry.tie_breaker || '-' %></li>
+<li>Number of entries: <%=pool.entries.size%></li>
+<li>Number of remaining outcomes: <%=pool.tournament_entry.picks.number_of_outcomes%></li>
+</ul>
+<% end %>
+<% if @message %>
+<span class="message"><%=@message%></span>
+<% end %>
+<table class="report">
+<thead>
+<tr>
+<td>Entry</td>
+<td>Chance<br/>for 1st</td>
+<td>Highest<br/>Place</td>
+<td>Current<br/>Score</td>
+<td>Max<br/>Score</td>
+<td>Tie<br/>Break</td>
+<td>Champions for 1st</td>
+</tr>
+</thead>
+<tbody>
+<% @stats.each do |stat| -%>
+<tr class="<%=cycle('even', 'odd', :name => 'rtclass')%>">
+<td><%=stat.entry.name%></td>
+<td><%=stat.times_champ * 100.0/pool.tournament_entry.picks.number_of_outcomes%>%</td>
+<td><%=stat.min_rank.ordinal%></td>
+<td><%=stat.entry.bracket.score_against(pool.tournament_entry.picks, pool.scoring_strategy)%></td>
+<td><%=stat.max_score%></td>
+<td><%=stat.entry.tie_breaker%></td>
+<td>
+<% stat.champs.sort_by{|k,v| -v}.each do |team, occurrences| -%>
+<%=team%> <%=occurrences%> (<%="%5.2f" % (occurrences.to_f * 100.0 / stat.times_champ)%>%)
+<br/>
+<% end -%>
+&nbsp;
+</td>
+</tr>
+<% end -%>
+</tbody>
+</table>

data/webgui/app/views/reports/_report.html.erb

@@ -1,5 +1,5 @@
-<% if report == 'leader' %>
-<%= render :partial => 'leader', :locals => {:pool => pool, :show_header => true}%>
+<% if ['leader', 'possibility'].include?(report) %>
+<%= render :partial => report, :locals => {:pool => pool, :show_header => true}%>
 <br/>
 <br/>
 <% else %>

data/webgui/app/views/reports/show.html.erb

@@ -4,6 +4,12 @@
 <li><%= link_to 'Entries', :report => 'entry'%></li>
 <li><%= link_to 'Score', :report => 'score'%></li>
 <li><%= link_to 'Leader', :report => 'leader'%></li>
+<% if @pool.pool.tournament_entry.picks.teams_left <= 16 %>
+<li><%= link_to 'Possibility', :report => 'possibility'%></li>
+<% end %>
+<% if @pool.pool.tournament_entry.picks.teams_left <= 4 %>
+<li><%= link_to 'Final Four', :report => 'final_four'%></li>
+<% end %>
 </ul>
 <div id="report">
 <% if params[:report] -%>

data/webgui/app/views/shared/_bracket.html.erb

@@ -61,27 +61,29 @@ end
 <div style="float: left">
 <table border="0">
 <tr>
-<td><%= f.label :name, "Entry Name"%></td><td><%= f.text_field :name %></td>
+<td><%= f.label :name, "Entry Name"%></td><td><% if is_editable%><%= f.text_field :name %><% else %> : <%=@entry.name%><% end %></td>
 </tr>
 <tr>
-<td><%= f.label :tie_break, 'Tie Breaker'%></td><td><%= f.text_field :tie_break %></td>
+<td><%= f.label :tie_break, 'Tie Breaker'%></td><td><% if is_editable%><%= f.text_field :tie_break %><%else%> : <%=@entry.tie_break || '-'%><%end%></td>
 </tr>
 </table>
 </div>
-<div style="float: left">
+<div style="float: left; margin-left: 25px;">
+<% if @entry.name != @pool.tournament_entry.name %>
 <small>
 Current Score: <%= @entry.bracket.score_against(@pool.tournament_entry.picks, @pool.scoring_strategy) %> Max. Possible Score: <%= @entry.bracket.maximum_score(@pool.tournament_entry.picks, @pool.scoring_strategy) %>
 </small>
+<% end %>
 </div>
 <input type="hidden" name="pool_id" value="<%=@entry.pool_id%>">
 <input type="hidden" name="picks" id="picks" value="">
-<% if is_editable %>
 <div style="clear: both">
+<% if is_editable %>
 <input type="Submit" value="Save Changes">
 <%= submit_tag 'Cancel Changes', :name => 'cancel', :confirm => 'Are you sure?'%>
 <%= submit_tag 'Reset Picks', :name => 'reset', :confirm => 'Are you sure? Resetting will clear all picks and start the bracket over from scratch!'%>
-</div>
 <% end -%>
+</div>
 <% end -%>
 <TABLE cellspacing=0 class="bracket">
 <TR>