rrschedule 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rrschedule.rb

@@ -4,7 +4,7 @@
 module RRSchedule
   class Schedule
     attr_reader :flights, :rounds, :gamedays
-    attr_accessor :teams, :rules, :cycles, :start_date, :exclude_dates,:shuffle, :balanced_gt, :balanced_ps
+    attr_accessor :teams, :rules, :cycles, :start_date, :exclude_dates,:shuffle, :group_flights, :balanced_gt, :balanced_ps
 
     def initialize(params={})
       @gamedays = []
@@ -15,6 +15,7 @@ module RRSchedule
       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.group_flights = params[:group_flights].nil? ? true : params[:group_flights]
       self.rules = params[:rules] || []
       self
     end
@@ -85,6 +86,15 @@ module RRSchedule
       self
     end
 
+    def total_nbr_games
+      total=0
+
+      @flights.each do |teams|
+         total += (teams.size / 2) * (teams.size-1)
+      end
+      total
+    end
+    
     #human readable schedule
     def to_s
       res = ""
@@ -133,24 +143,47 @@ module RRSchedule
 
     #Dispatch games according to available playing surfaces and game times
     def dispatch_games(rounds)
+
       rounds_copy =  Marshal.load(Marshal.dump(rounds)) #deep clone
-      cur_flight_index = 0
-
-      while !rounds_copy.flatten.empty? do
-        cur_round = rounds_copy[cur_flight_index].shift
-        #process the next round in the current flight
-        if cur_round
-          cur_round.games.each do |game|
-            dispatch_game(game) unless [game.team_a,game.team_b].include?(:dummy)
+
+      flat_games = []
+      if group_flights
+        while rounds_copy.flatten.size > 0 do
+          @flights.each_with_index do |f,flight_index|
+            flat_games << rounds_copy[flight_index].shift.games
+          end
+        end          
+      else
+        flight_index = round_index = 0
+        game_ctr = 0 
+        while game_ctr < total_nbr_games
+          if rounds_copy[flight_index][round_index] != nil
+            game = rounds_copy[flight_index][round_index].games.shift
+            if game
+              flat_games << game 
+              game_ctr += 1
+            end
           end
-        end
 
-        if cur_flight_index == @flights.size-1
-          cur_flight_index = 0
-        else
-          cur_flight_index += 1
+          #check if round is empty
+          round_empty=true
+          @flights.size.times do |i| 
+            round_empty = round_empty && (rounds_copy[i][round_index].nil? || rounds_copy[i][round_index].games.empty?)
+          end
+          
+          if flight_index == @flights.size-1
+            flight_index = 0
+            round_index+=1 if round_empty
+          else
+            flight_index += 1
+          end          
         end
       end
+      
+      flat_games.flatten!
+      flat_games.each do |game|
+        dispatch_game(game) unless [game.team_a,game.team_b].include?(:dummy)
+      end
 
       #We group our schedule by gameday
       s=@schedule.group_by{|fs| fs[:gamedate]}.sort

metadata

@@ -1,39 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rrschedule
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - flamontagne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-02 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem automate the process of creating a round-robin sport schedule.
 email: flamontagne@azanka.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .document
 - LICENSE
 - README.markdown
@@ -44,33 +45,28 @@ files:
 - 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: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Round-Robin schedule generator
 test_files: []
-