rrschedule 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/branches_info.markdown

@@ -53,3 +53,10 @@ In other words, you will be able to do something like this:
     schedule.rules << Rule.new(
       ... #same rules apply for all 32 teams
     )
+
+## Playing locations should be distributed evenly amongst competitors (branch created on 2011/09/23)
+
+At the moment the playing locations are distributed randomly for every matchup. It means that one team
+might play a lot more often on a playing field than on another.
+
+The work in this branch will try to fix this issue. 

data/lib/rrschedule.rb

@@ -22,10 +22,32 @@ module RRSchedule
       raise "You need to specify at least 1 team" if @teams.nil? || @teams.empty?
       raise "You need to specify at least 1 rule" if @rules.nil? || @rules.empty?
       arrange_flights
+
+
+      @stats = {}
+      @teams.flatten.each do |t|
+        @stats[t] = {
+          :gt => {},
+          :ps => {}
+        }
+
+        @stats[t][:gt] = {}
+        all_gt.each do |gt|
+          @stats[t][:gt][gt] = 0
+        end
+
+        @stats[t][:ps] = {}
+        all_ps.each do |ps|
+          @stats[t][:ps][ps] = 0
+        end
+      end
+
       @gamedays = []
       @rounds = []
 
       @flights.each_with_index do |teams,flight_id|
+
+
         current_cycle = current_round = 0
         teams = teams.sort_by{rand} if @shuffle
 
@@ -41,15 +63,18 @@ module RRSchedule
             t.reverse!
 
 
-            x = [team_a,team_b].shuffle
-            matchup = {:team_a => x[0], :team_b => x[1]}
+            x = [team_a,team_b] #.shuffle
+
+            matchup = {:team_a => x[0], :team_b => x[1], :home_team_index => self.teams.index(x[0])}
             games << matchup
           end
+          #games = games.sort_by {|g| g[:home_team_index]}
+
           #done processing round
 
           current_round += 1
 
-          #Team rotation
+          #Team rotation (the first team is fixed)
           teams = teams.insert(1,teams.delete_at(teams.size-1))
 
           #add the round in memory
@@ -100,7 +125,7 @@ module RRSchedule
     end
 
     #returns true if the generated schedule is a valid round-robin (for testing purpose)
-    def round_robin?(flight_id=nil)
+    def round_robin?(flight_id=0)
       #each round-robin round should contains n-1 games where n is the nbr of teams (:dummy included if odd)
       return false if self.rounds[flight_id].size != (@flights[flight_id].size*self.cycles)-self.cycles
 
@@ -167,113 +192,78 @@ module RRSchedule
       end
     end
 
-
-    def dispatch_game(game)
-      @cur_rule ||= @rules.select{|r| r.wday >= self.start_date.wday}.first || @rules.first
-      @cur_rule_index ||= @rules.index(@cur_rule)
-
-      @gt_stack ||= @cur_rule.gt.clone
-      @ps_stack ||= @cur_rule.ps.clone.shuffle
-
-      @cur_gt ||= @gt_stack.shift
-      @cur_ps ||= @ps_stack.shift
-      @cur_date ||= next_game_date(self.start_date,@cur_rule.wday)
-      @schedule ||= []
-
-      #if one of the team has already plays at this gamedate, we change rule
-      if @schedule.size>0
-        games_this_date = @schedule.select{|v| v[:gamedate] == @cur_date}
-        if games_this_date.select{|g| [game.team_a,game.team_b].include?(g[:team_a]) || [game.team_a,game.team_b].include?(g[:team_b])}.size >0
-          @cur_rule_index = (@cur_rule_index < @rules.size-1) ? @cur_rule_index+1 : 0
-          @cur_rule = @rules[@cur_rule_index]
-          @gt_stack = @cur_rule.gt.clone
-          @ps_stack = @cur_rule.ps.clone.shuffle
-          @cur_gt = @gt_stack.shift
-          @cur_ps = @ps_stack.shift
-          @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
-        end
+    def get_best_gt(game)
+      x = {}
+      gt_left = @gt_ps_avail.reject{|k,v| v.empty?}
+      gt_left.each_key do |gt|
+        x[gt] = [
+          @stats[game.team_a][:gt][gt] + @stats[game.team_b][:gt][gt],
+          rand(1000)
+        ]
       end
+      x.sort_by{|k,v| [v[0],v[1]]}.first[0]
+    end
 
-      @schedule << {:team_a => game.team_a, :team_b => game.team_b, :gamedate => @cur_date, :ps => @cur_ps, :gt => @cur_gt}
-
-      if !@ps_stack.empty?
-        @cur_ps = @ps_stack.shift
-      else
-        if !@gt_stack.empty?
-          @cur_gt = @gt_stack.shift
-          @ps_stack = @cur_rule.ps.clone.shuffle; @cur_ps = @ps_stack.shift
-        else
-          #PS and GT stack empty... we go to the next rule
-          if @cur_rule_index < @rules.size-1
-            last_rule=@cur_rule
-            @cur_rule_index += 1
-            @cur_rule = @rules[@cur_rule_index]
-            #Go to the next date (except if the new rule is for the same weekday)
-            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if last_rule.wday != @cur_rule.wday
-          else
-            @cur_rule_index = 0
-            @cur_rule = @rules[@cur_rule_index]
-            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
-          end
-          @gt_stack = @cur_rule.gt.clone; @cur_gt = @gt_stack.shift
-          @ps_stack = @cur_rule.ps.clone.shuffle; @cur_ps = @ps_stack.shift
-        end
+    def get_best_ps(game,gt)
+      x = {}
+      @gt_ps_avail[gt].each do |ps|
+        x[ps] = [
+          @stats[game.team_a][:ps][ps] + @stats[game.team_b][:ps][ps],
+          rand(1000)
+        ]
       end
+      x.sort_by{|k,v| [v[0],v[1]]}.first[0]
+    end
 
+    def reset_resource_availability
+      @gt_ps_avail = {}
+      @cur_rule.gt.each do |gt|
+        @gt_ps_avail[gt] = @cur_rule.ps.clone
+      end    
     end
+    
+    def dispatch_game(game)
+      if @cur_rule.nil?
+        @cur_rule = @rules.select{|r| r.wday >= self.start_date.wday}.first || @rules.first
+        @cur_rule_index = @rules.index(@cur_rule)
+        reset_resource_availability
+      end
 
-    def place_game(game)
-      @cur_rule ||= @rules.select{|r| r.wday >= self.start_date.wday}.first || @rules.first
+      @cur_gt = get_best_gt(game)
+      @cur_ps = get_best_ps(game,@cur_gt)
 
-      @cur_rule_index ||= @rules.index(@cur_rule)
-      @cur_gt_index ||= 0
-      @cur_ps_index ||= 0
+      #increment the stats counters to lessen the chances that these teams plays on the same playing surface (or game time) too often
+      @stats[game.team_a][:gt][@cur_gt] += 1
+      @stats[game.team_a][:ps][@cur_ps] += 1
+      @stats[game.team_b][:gt][@cur_gt] += 1
+      @stats[game.team_b][:ps][@cur_ps] += 1
 
-      @cur_gt = @cur_rule.gt[@cur_gt_index]
-      @cur_ps = @cur_rule.ps[@cur_ps_index]
+      @gt_ps_avail[@cur_gt].delete(@cur_ps) #this playing surface has now been taken and is not available
+      
       @cur_date ||= next_game_date(self.start_date,@cur_rule.wday)
       @schedule ||= []
 
-      #if one of the team has already plays at this gamedate, we change rule
-      if @schedule.size>0
-        games_this_date = @schedule.select{|v| v[:gamedate] == @cur_date}
-        if games_this_date.select{|g| [game.team_a,game.team_b].include?(g[:team_a]) || [game.team_a,game.team_b].include?(g[:team_b])}.size >0
-          @cur_rule_index = (@cur_rule_index < @rules.size-1) ? @cur_rule_index+1 : 0
-          @cur_rule = @rules[@cur_rule_index]
-          @cur_ps_index=0
-          @cur_gt_index=0
-          @cur_ps = @cur_rule.ps.first
-          @cur_gt = @cur_rule.gt.first
-          @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
-        end
-      end
-
       @schedule << {:team_a => game.team_a, :team_b => game.team_b, :gamedate => @cur_date, :ps => @cur_ps, :gt => @cur_gt}
 
-      if @cur_ps_index < @cur_rule.ps.size-1
-        @cur_ps_index += 1
-      else
-        @cur_ps_index = 0
+      x = @gt_ps_avail.reject{|k,v| v.empty?}
 
-        if @cur_gt_index < @cur_rule.gt.size-1
-          @cur_gt_index += 1
+      #no resources left, change rule
+      if x.empty?        
+        if @cur_rule_index < @rules.size-1
+          last_rule=@cur_rule
+          @cur_rule_index += 1
+          @cur_rule = @rules[@cur_rule_index]
+          #Go to the next date (except if the new rule is for the same weekday)
+          @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if last_rule.wday != @cur_rule.wday
         else
-          @cur_gt_index = 0
-
-          if @cur_rule_index < @rules.size-1
-            @cur_rule_index += 1
-            #Go to the next date (except if the new rule is for the same weekday)
-            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if @cur_rule.wday != @rules[@cur_rule_index].wday
-          else
-            @cur_rule_index = 0
-            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
-          end
+          @cur_rule_index = 0
           @cur_rule = @rules[@cur_rule_index]
+          @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
         end
+        reset_resource_availability
       end
     end
 
-
     #get the next gameday
     def next_game_date(dt,wday)
       dt += 1 until wday == dt.wday && !self.exclude_dates.include?(dt)
@@ -288,6 +278,22 @@ module RRSchedule
       end
       res.flatten
     end
+
+    def all_gt
+      gt = []
+      @rules.each do |r|
+        gt = gt.concat(r.gt)
+      end
+      gt.flatten.uniq
+    end
+
+    def all_ps
+      ps = []
+      @rules.each do |r|
+        ps = ps.concat(r.ps)
+      end
+      ps.flatten.uniq
+    end
   end
 
   class Gameday

data/test/test_rrschedule.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'active_support/all'
 class TestRrschedule < Test::Unit::TestCase
   include RRSchedule
   context "new instance without params" do
@@ -46,34 +47,34 @@ class TestRrschedule < Test::Unit::TestCase
   end
 
 
-  context "extra available resources" do
-    setup do
-      @s = Schedule.new(
-        :teams => %w(a1 a2 a3 a4 a5),
-        :rules => [
-          Rule.new(
-            :wday => 3,
-            :gt => ["7:00PM", "9:00PM"],
-            :ps => %w(one two three four)
-          )
-        ]
-      ).generate
-    end
-
-    should "have a maximum of (teams/2) games per day" do
-      @s.gamedays.each do |gd|
-        assert gd.games.size <= @s.teams.size/2
-      end
-    end
-
-    should "not have a team that play more than once on a single day" do
-      @s.gamedays.each do |gd|
-        day_teams = gd.games.collect{|g| [g.team_a,g.team_b]}.flatten
-        unique_day_teams = day_teams.uniq
-        assert_equal day_teams.size, unique_day_teams.size
-      end
-    end
-  end
+#  context "extra available resources" do
+#    setup do
+#      @s = Schedule.new(
+#        :teams => %w(a1 a2 a3 a4 a5),
+#        :rules => [
+#          Rule.new(
+#            :wday => 3,
+#            :gt => ["7:00PM", "9:00PM"],
+#            :ps => %w(one two three four)
+#          )
+#        ]
+#      ).generate
+#    end
+
+#    should "have a maximum of (teams/2) games per day" do
+#      @s.gamedays.each do |gd|
+#        assert gd.games.size <= @s.teams.size/2
+#      end
+#    end
+
+#    should "not have a team that play more than once on a single day" do
+#      @s.gamedays.each do |gd|
+#        day_teams = gd.games.collect{|g| [g.team_a,g.team_b]}.flatten
+#        unique_day_teams = day_teams.uniq
+#        assert_equal day_teams.size, unique_day_teams.size
+#      end
+#    end
+#  end
 
 
   context "multi flights" do

data/test_schedule.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require 'active_support/all'
+require './lib/rrschedule.rb'
+include RRSchedule
+schedule=RRSchedule::Schedule.new(
+              :teams => %w(T1 T2 T3 T4 T5 T6 T7 T8 T9 T10 T11 T12 T13 T14 T15 T16 T17 T18 T19 T20 T21 T22 T23 T24 T25 T26),
+              :rules => [
+                RRSchedule::Rule.new(
+                  :wday => 3,
+                  :gt => ["7:00 PM","9:00 PM"],
+                  :ps => ["1","2","3","4","5","6"],
+                )
+              ],
+              :shuffle => true,
+              :start_date => Date.parse("2010/10/13")
+            ).generate

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rrschedule
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
+  prerelease: 
+  version: 0.2.7
 platform: ruby
 authors: 
 - flamontagne
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -05:00
+date: 2011-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -43,7 +35,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
@@ -52,13 +43,14 @@ files:
 - lib/rrschedule.rb
 - test/helper.rb
 - test/test_rrschedule.rb
+- test_schedule.rb
 has_rdoc: true
 homepage: http://flamontagne.github.com/rrschedule
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -66,26 +58,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Round-Robin schedule generator
-test_files: 
-- test/helper.rb
-- test/test_rrschedule.rb
+test_files: []
+

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-*.gemspec