rrschedule 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/rrschedule.rb

@@ -133,6 +133,7 @@ module RRSchedule
     #a game date, a game time and a playing surface. We then process our rounds one by one
     #and we put each matchup in the next available slot of the flat schedule
     def dispatch_games(rounds)
+      teams_day = {}
       flat_schedule = generate_flat_schedule
 
       rounds_copy =  Marshal.load(Marshal.dump(rounds)) #deep clone
@@ -145,9 +146,20 @@ module RRSchedule
         if cur_round
           cur_round.games.each do |game|
             unless [game.team_a,game.team_b].include?(:dummy)
+              if teams_day[flat_schedule[i][:gamedate]] && (teams_day[flat_schedule[i][:gamedate]].include?(game.team_a) || teams_day[flat_schedule[i][:gamedate]].include?(game.team_b))
+                #team is already playing this day. This can happen if we have flights with different number of teams in it.
+                gamedate = flat_schedule[i][:gamedate]
+                while flat_schedule[i] && flat_schedule[i][:gamedate] == gamedate do
+                  i += 1
+                end
+              end
+
               flat_schedule[i][:team_a] = game.team_a
               flat_schedule[i][:team_b] = game.team_b
-              i+=1
+              teams_day[flat_schedule[i][:gamedate]] ||= []
+              teams_day[flat_schedule[i][:gamedate]] << game.team_a
+              teams_day[flat_schedule[i][:gamedate]] << game.team_b
+              i += 1
             end
           end
         end
@@ -189,11 +201,14 @@ module RRSchedule
 
       @flights.each do |flight|
         games_left += @cycles * (flight.include?(:dummy) ? ((flight.size-1)/2.0)*(flight.size-2) : (flight.size/2)*(flight.size-1))
-        max_games_per_day += (flight.include?(:dummy) ? (flight.size-2)/2.0 : (flight.size-1)/2.0).ceil
+        max_games_per_day += (flight.include?(:dummy) ? ((flight.size-2)/2.0) : (flight.size-1)/2.0).ceil
       end
 
-      #process all games
+
+      #while there are games to process...
       while games_left > 0 do
+
+        #add all possible games based on the current rule
         cur_rule.gt.each do |gt|
           cur_rule.ps.each do |ps|
 

data/test/test_rrschedule.rb

@@ -140,7 +140,7 @@ class TestRrschedule < Test::Unit::TestCase
   context "multiple rules on the same weekday" do
     setup do
       @s = Schedule.new
-      @s.teams = [%w(a1 a2 a3 a4 a5), %w(b1 b2 b3 b4 b5 b6 b7 b8)]
+      @s.teams = [%w(a1 a2 a3 a4 a5 a6 a7 a8), %w(b1 b2 b3 b4 b5 b6 b7 b8)]
       @s.rules = [
         Rule.new(:wday => 4, :gt => ["7:00PM"], :ps => %w(field#1 field#2)),
         Rule.new(:wday => 4, :gt => ["9:00PM"], :ps => %w(field#1 field#2 field#3))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rrschedule
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - flamontagne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-02-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency