tournament-system 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658d99ded4876bcc1c1ec78dbb38066d3dfae06a
-  data.tar.gz: 9a11ee1ed63be549fc09d2c6f40165a316188949
+  metadata.gz: 2e2feaf11e43d4582382ab6702fee535a796e00c
+  data.tar.gz: 79c8750797f63e42658afcbbc05b240308801209
 SHA512:
-  metadata.gz: c355fa4f8edfeb89e524b613cf98e66ab551f3cfe773690a039d3d7996342eab2556e151a69fc775226d11a0819cbe7660685b985f1576fcf44998a6642113f8
-  data.tar.gz: d5abd06fb557db3adf12c9de53d19fbfa7097c198d0b637a6a4a7a37b1ea9826ec08cabe8a1944609c2b5a3db35e67c320f7a512f41aa4fce11a4e9fa8643f60
+  metadata.gz: 11128da929528638694f487a17aa28baa25fc4dd090ea88b7a378553f3894ffcd8c3c8c4c30f30cff2388dbf6d71872e74532e4ecf6c1e891051ac280483f1de
+  data.tar.gz: 8991877ed078ae29d705d630fb8fad9a828f52264b6546109ff74fbf6e460fce6599516318a13598177251ded7c0bf3e895aa729046b7985e6df66586a8884b9

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/ozfortress/tournament-system.svg?branch=master)](https://travis-ci.org/ozfortress/tournament-system)
 [![Coverage Status](https://coveralls.io/repos/github/ozfortress/tournament-system/badge.svg?branch=master)](https://coveralls.io/github/ozfortress/tournament-system?branch=master)
 [![Gem Version](https://badge.fury.io/rb/tournament-system.svg)](https://badge.fury.io/rb/tournament-system)
+[![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/ozfortress/tournament-system/master)
 
 This is a simple gem that implements numerous tournament systems.
 
@@ -39,10 +40,6 @@ class Driver < Tournament::Driver
     ...
   end
 
-  def matches_for_round(round)
-    ...
-  end
-
   def seeded_teams
     ...
   end
@@ -75,14 +72,14 @@ instance:
 ```ruby
 driver = Driver.new
 
-# Generate the 3rd round of a single elimination tournament
-Tournament::SingleElimination.generate driver, round: 2
+# Generate a round of a single elimination tournament
+Tournament::SingleElimination.generate driver
 
-# Generate a round for a round robin tournament, guesses round automatically
+# Generate a round for a round robin tournament
 Tournament::RoundRobin.generate driver
 
 # Generate a round for a swiss system tournament
-# with Dutch pairings (default) with a minimum pair size of 6
+# with Dutch pairings (default) with a minimum pair size of 6 (default 4)
 Tournament::Swiss.generate driver, pairer: Tournament::Swiss::Dutch,
                                    pair_options: { min_pair_size: 6 }
 

data/lib/tournament/driver.rb

@@ -3,6 +3,14 @@ module Tournament
   #
   # To use any tournament system implemented in this gem, simply subclass this
   # class and implement the interface functions.
+  #
+  # The interface is designed to be useable with arbitrary data,
+  # meaning that as long as your data is consistent it will work with this gem.
+  # Be it Ruby on Rails Models or simply integers.
+  #
+  # Certain tournament systems will not make use of certain parts of this
+  # interface. You can for example leave out `#get_team_score` if you're not
+  # using the Swiss tournament system.
   # :reek:UnusedParameters
   class Driver
     # rubocop:disable Lint/UnusedMethodArgument
@@ -12,11 +20,6 @@ module Tournament
       raise 'Not Implemented'
     end
 
-    # Get the matches played for a particular round
-    def matches_for_round(round)
-      raise 'Not Implemented'
-    end
-
     # Get the teams playing with their initial seedings
     def seeded_teams
       raise 'Not Implemented'

data/lib/tournament/seeder/single_bracket.rb

@@ -7,17 +7,32 @@ module Tournament
       extend self
 
       def seed(teams)
-        groups = teams.each_slice(2)
+        unless (Math.log2(teams.length) % 1).zero?
+          raise ArgumentError, 'Need power-of-2 teams'
+        end
+
+        teams = teams.map.with_index { |team, index| SeedTeam.new(team, index) }
+        seed_bracket(teams).map(&:team)
+      end
 
-        top_half    = groups.map { |pair| pair[0] }
-        bottom_half = groups.map { |pair| pair[1] }
+      private
 
-        if top_half.length > 2
-          top_half = seed top_half
-          bottom_half = seed bottom_half
-        end
+      # Structure for wrapping a team with it's seed index
+      SeedTeam = Struct.new(:team, :index)
+
+      # Recursively seed the top half of the teams
+      # and match teams reversed by index to the bottom half
+      def seed_bracket(teams)
+        return teams if teams.length <= 2
+
+        top_half, bottom_half = teams.each_slice(teams.length / 2).to_a
+        top_half = seed top_half
+
+        top_half.map do |team|
+          match = bottom_half[-team.index - 1]
 
-        top_half + bottom_half
+          [team, match]
+        end.flatten
       end
     end
   end

data/lib/tournament/single_elimination.rb

@@ -4,12 +4,12 @@ module Tournament
     extend self
 
     def generate(driver, options = {})
-      round = options[:round] || raise('Missing option :round')
+      round = guess_round(driver)
 
       teams = if driver.matches.empty?
                 seed_teams driver.seeded_teams, options
               else
-                last_matches = driver.matches_for_round(round - 1)
+                last_matches = previous_round_matches driver, round
                 get_match_winners driver, last_matches
               end
 
@@ -20,6 +20,20 @@ module Tournament
       total_rounds_for_teams(driver.seeded_teams)
     end
 
+    def guess_round(driver)
+      rounds = total_rounds(driver)
+      teams_count = 2**rounds
+      matches_count = driver.matches.length
+
+      # Make sure we don't have too many matches
+      raise ArgumentError, 'Too many matches' unless teams_count > matches_count
+
+      round = rounds - Math.log2(teams_count - matches_count)
+      # Make sure we don't have some weird number of matches
+      raise ArgumentError, 'Invalid number of matches' unless (round % 1).zero?
+      round.to_i
+    end
+
     private
 
     def seed_teams(teams, options)
@@ -30,13 +44,11 @@ module Tournament
     end
 
     def padd_teams(teams)
-      # Insert the padding after the top half of the total number of teams
-      total = 2**total_rounds_for_teams(teams)
-      half = total / 2
+      required = 2**total_rounds_for_teams(teams)
+      padding = required - teams.length
 
-      padding = total - teams.length
-
-      teams[0...half] + [nil] * padding + teams[half...teams.length]
+      # Insert the padding at the bottom to give top teams byes
+      teams + [nil] * padding
     end
 
     def total_rounds_for_teams(teams)
@@ -49,6 +61,13 @@ module Tournament
       matches.map { |match| driver.get_match_winner(match) }
     end
 
+    def previous_round_matches(driver, round)
+      rounds_left = total_rounds(driver) - round - 1
+      previous_matches_count = 2**rounds_left
+
+      driver.matches[-previous_matches_count, previous_matches_count]
+    end
+
     def create_matches(driver, teams)
       teams.each_slice(2) do |slice|
         next if slice.all?(&:nil?)

data/lib/tournament/swiss/common.rb

@@ -44,7 +44,7 @@ module Tournament
               groups[new_key] = group + groups[new_key]
             # If there isn't, merge into the adjacent greater group
             else
-              new_key = group_keys[index - 1]
+              new_key = new_keys[-1]
               groups[new_key] += group
             end
           # Leave larger groups the way they are

data/lib/tournament/swiss/dutch.rb

@@ -18,6 +18,7 @@ module Tournament
 
       private
 
+      # Match the top half with the bottom half
       def dutch_pairing(teams)
         half = teams.length / 2
         top = teams[0...half]

data/lib/tournament/version.rb

@@ -1,3 +1,3 @@
 module Tournament
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/tournament-system.gemspec

@@ -2,7 +2,7 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'tournament-system'
+require 'tournament/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'tournament-system'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tournament-system
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Benjamin Schaaf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler