rrschedule 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.3.1

data/branches_info.markdown

@@ -60,3 +60,11 @@ At the moment the playing locations are distributed randomly for every matchup.
 might play a lot more often on a playing field than on another.
 
 The work in this branch will try to fix this issue. 
+
+## Optional balancing for Game Times (branch crated on 2011/10/02)
+
+I created this branch to solve a very specific case. When you generate a schedule with multiple divisions, you generally want that all
+teams of a given division plays at the same game times. (e.g. Division A plays at 7:00, B plays at 9:00 and so on). However with the new 
+balancing feature (see 2011/09/23 branch), it is no longer possible to achieve this.
+
+I will add options balanced_gt and balanced_ps, both true by default.

data/lib/rrschedule.rb

@@ -4,13 +4,15 @@
 module RRSchedule
   class Schedule
     attr_reader :flights, :rounds, :gamedays
-    attr_accessor :teams, :rules, :cycles, :start_date, :exclude_dates,:shuffle
+    attr_accessor :teams, :rules, :cycles, :start_date, :exclude_dates,:shuffle, :balanced_gt, :balanced_ps
 
     def initialize(params={})
       @gamedays = []
       self.teams = params[:teams] || []
       self.cycles = params[:cycles] || 1
       self.shuffle = params[:shuffle].nil? ? true : params[:shuffle]
+      self.balanced_gt = params[:balanced_gt].nil? ? true : params[:balanced_gt]
+      self.balanced_ps = params[:balanced_ps].nil? ? true : params[:balanced_ps]      
       self.exclude_dates = params[:exclude_dates] || []
       self.start_date = params[:start_date] || Date.today
       self.rules = params[:rules] || []
@@ -232,24 +234,34 @@ module RRSchedule
     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)
-        ]
+      
+      if self.balanced_gt
+        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]
+      else
+        gt_left.sort.first[0]
       end
-      x.sort_by{|k,v| [v[0],v[1]]}.first[0]
     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)
-        ]
+      
+      if self.balanced_ps
+        @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]
+      else
+        @gt_ps_avail[gt].first[0]
       end
-      x.sort_by{|k,v| [v[0],v[1]]}.first[0]
     end
 
     def reset_resource_availability

data/test_schedule.rb

@@ -33,3 +33,35 @@ schedule=RRSchedule::Schedule.new(
               :shuffle => true,
               :start_date => Date.parse("2010/10/13")
             ).generate
+            
+require 'rubygems'
+require 'active_support/all'
+require './lib/rrschedule.rb'
+include RRSchedule
+schedule=RRSchedule::Schedule.new(
+              :teams => [
+                %w(A1 A2 A3 A4 A5 A6 A7 A8),
+                %w(B1 B2 B3 B4 B5 B6 B7 B8),
+                %w(C1 C2 C3 C4 C5 C6 C7 C8),
+                %w(D1 D2 D3 D4 D5 D6 D7 D8),
+                %w(E1 E2 E3 E4 E5 E6 E7 E8),                                                                
+              ],
+
+              :rules => [
+                RRSchedule::Rule.new(
+                  :wday => 1,
+                  :gt => ["7:00 PM"],
+                  :ps => ["1","2","3","4"],
+                ),
+                RRSchedule::Rule.new(
+                  :wday => 3,
+                  :gt => ["7:00 PM","9:00 PM"],
+                  :ps => ["1","2","3","4","5","6","7","8"],
+                )
+                
+              ],
+              :cycles => 1,
+              :start_date => Date.parse("2010/10/13"),
+              :balanced_gt => false,
+              :balanced_ps => true
+            ).generate            

metadata

@@ -2,7 +2,7 @@
 name: rrschedule
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - flamontagne