tournament-system 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 282ede5d3142f58c0ec7c91288de41babcea71da
-  data.tar.gz: 8be80356ef88d1d47d1db402790a37ca3832e4d3
+  metadata.gz: bf472f14954ad05551b972f6001a53dbfdbe9f0a
+  data.tar.gz: 41769df3e3b025ff4f4b0986e33585e845b37fcd
 SHA512:
-  metadata.gz: c82ca2650a96ecd49d86ea129b9004dcf0af59d773136062dbc162db5ac1e77c7438b66fed6d1486d15bde29b1bbd061e005743dc52b2ba552653b6f29539a83
-  data.tar.gz: bde5fb564d5c9a6863d751c65fe5e80d1d6952d4e06b3674ea10a2136e68b036b8eed4c50310c3aff2c3bdabef058f1ab16f45ee3ecc7e83a4705e3905af30b7
+  metadata.gz: b38f47ed72a2a1765f78b9d706702670cf4aa84457dc399c41fdce30f7e0f2a3dfc0b5ac8ea6a27fd95e93a7726c7629d9067b784f27458a09b37b1d624ba63c
+  data.tar.gz: 658ec1108455ad0902c288c2d510588a91d07be6dc8200c759784d79b2e74eef3ecda3864334b53af8b6f563ffe1d7ed48c234d4505ab8c56bc9a90fc5848c9c

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  DisplayCopNames: true
   TargetRubyVersion: 2.3
 
 # This is fine, really

data/lib/tournament/driver.rb

@@ -14,6 +14,7 @@ module Tournament
   # :reek:UnusedParameters
   class Driver
     # rubocop:disable Lint/UnusedMethodArgument
+    # :nocov:
 
     # Get all matches
     def matches
@@ -50,6 +51,7 @@ module Tournament
       raise 'Not Implemented'
     end
 
+    # :nocov:
     # rubocop:enable Lint/UnusedMethodArgument
 
     # Get the losing team of a specific match

data/lib/tournament/swiss/common.rb

@@ -27,7 +27,8 @@ module Tournament
 
       # Merges small groups to the right (if possible) such that all groups
       # are larger than min_size.
-      # rubocop:disable Metrics/MethodLength :reek:TooManyStatements
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # :reek:TooManyStatements
       def merge_small_groups(groups, group_keys, min_size)
         new_keys = []
 
@@ -45,7 +46,14 @@ module Tournament
             # If there isn't, merge into the adjacent greater group
             else
               new_key = new_keys[-1]
-              groups[new_key] += group
+
+              if new_key
+                groups[new_key] += group
+              else
+                # If there are no new keys just use the current key
+                new_keys << key
+                groups[key] = group
+              end
             end
           # Leave larger groups the way they are
           else
@@ -60,10 +68,10 @@ module Tournament
 
       # Get a set of already played matches. Matches are also sets
       def matches_set(driver)
-        existing_matches = Set.new
+        existing_matches = Hash.new(0)
         driver.matches.each do |match|
-          match_teams = driver.get_match_teams match
-          existing_matches.add Set.new match_teams
+          match_teams = Set.new driver.get_match_teams match
+          existing_matches[match_teams] += 1
         end
         existing_matches
       end
@@ -75,7 +83,7 @@ module Tournament
 
       # Count the number of matches already played
       def count_existing_matches(matches, existing_matches)
-        matches.count { |match| existing_matches.include?(Set.new(match)) }
+        matches.map { |match| existing_matches[Set.new(match)] }.reduce(:+)
       end
 
       # Finds the first permutation of teams that has a unique pairing.
@@ -101,10 +109,10 @@ module Tournament
             best_matches = matches
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         best_matches
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/tournament/version.rb

@@ -1,3 +1,3 @@
 module Tournament
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tournament-system
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Benjamin Schaaf
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Implements various tournament systems