rrschedule 0.2.7 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/rrschedule.rb

@@ -242,6 +242,19 @@ module RRSchedule
       
       @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]
+          reset_resource_availability
+          @cur_gt = get_best_gt(game)
+          @cur_ps = get_best_ps(game,@cur_gt)          
+          @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}
 

data/test/test_rrschedule.rb

@@ -47,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

metadata

@@ -2,7 +2,7 @@
 name: rrschedule
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - flamontagne
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 -04:00
+date: 2011-09-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency