sports-manager 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c758d344e9f382f5f1490e5a561b9985bac567cab55277644a0ae48374150f43
-  data.tar.gz: 1e8f37239ca689cb3103112a868ec9add0e1b7e95f7fb14a291a80a70b2e856d
+  metadata.gz: 896fa713f3fa999a6d852b8987a626998201f976a48c382297944bd0068488e9
+  data.tar.gz: e3f14be9cd4eaa4edf88a084ae4d041afd70800c536177fed88f20e5bb8be02c
 SHA512:
-  metadata.gz: 2d27aa5f4eb1b3ca85708b9f15139a73e31c5fabd35a47396caf7a59c51cfd0f04bb948d86f7cd57aa70de9436634f091472d75b6354b7e4946b895b4d980458
-  data.tar.gz: 742a411241704d99cbe9b4d6410ccf5a4d5dbb829a96210eac778dc9105ba31c0e1adafbe6308d05e257f50fef2ee0c4fccd5d0db222ec4fb43ead9545f87778
+  metadata.gz: '099e7f7e9049254d6ee2b68a34acb263308235f0d67e829fbaaff182b3cb59fbbbb75ab52471fd620af2c31551630008fc0613719ef2d4f802e4a19f9e57807e'
+  data.tar.gz: e2e7c3057107fd7ae76f1dcb364246003cf8ff889fc1a9ad4f8a5aee42cbfaa580c944d33455eef1cb0dc72a37ead9b087c25799adee3e2e465f9c789bc2c0ed

data/README.md

@@ -16,6 +16,11 @@ You can install using the following command:
 gem install "sports-manager"
 ```
 
+Or add the following line to your Gemfile:
+```bash
+gem "sports-manager"
+```
+
 Then install it:
 
 ```bash

data/lib/sports_manager/constraints/all_different_constraint.rb

@@ -8,7 +8,9 @@ module SportsManager
       attr_reader :matches
 
       def self.for_tournament(tournament:, csp:)
-        csp.add_constraint(new(tournament.matches.values.flatten))
+        matches = tournament.matches.values.flatten
+
+        csp.add_constraint(new(matches))
       end
 
       def initialize(matches)

data/lib/sports_manager/constraints/match_constraint.rb

@@ -10,9 +10,11 @@ module SportsManager
       def self.for_tournament(tournament:, csp:)
         tournament.matches.each do |(_category, matches)|
           matches.select(&:previous_matches?).each do |match|
-            csp.add_constraint(
-              new(target_match: match, matches: match.previous_matches)
-            )
+            match.previous_matches.each do |previous_match|
+              csp.add_constraint(
+                new(target_match: match, matches: [previous_match])
+              )
+            end
           end
         end
       end

data/lib/sports_manager/constraints/multi_category_constraint.rb

@@ -7,19 +7,22 @@ module SportsManager
                   :match_time, :break_time, :minimum_match_gap
 
       MINUTE = 60
+      IN_PAIRS = 2
 
       def self.for_tournament(tournament:, csp:)
         tournament.multi_tournament_participants.each do |participant|
           matches = tournament.find_participant_matches(participant)
 
-          constraint = new(
-            target_participant: participant,
-            matches: matches,
-            match_time: tournament.match_time,
-            break_time: tournament.break_time
-          )
+          matches.combination(IN_PAIRS) do |match1, match2|
+            constraint = new(
+              target_participant: participant,
+              matches: [match1, match2],
+              match_time: tournament.match_time,
+              break_time: tournament.break_time
+            )
 
-          csp.add_constraint(constraint)
+            csp.add_constraint(constraint)
+          end
         end
       end
 

data/lib/sports_manager/constraints/next_round_constraint.rb

@@ -13,12 +13,14 @@ module SportsManager
           .matches.values.flatten
           .select(&:previous_matches?)
           .each do |match|
-            csp.add_constraint new(
-              target_match: match,
-              matches: match.previous_matches,
-              match_time: tournament.match_time,
-              break_time: tournament.break_time
-            )
+            match.previous_matches.each do |previous_match|
+              csp.add_constraint new(
+                target_match: match,
+                matches: [previous_match],
+                match_time: tournament.match_time,
+                break_time: tournament.break_time
+              )
+            end
           end
       end
 

data/lib/sports_manager/constraints/no_overlapping_constraint.rb

@@ -5,13 +5,17 @@ module SportsManager
     class NoOverlappingConstraint < ::CSP::Constraint
       attr_reader :matches, :match_time
 
+      IN_PAIRS = 2
+
       def self.for_tournament(tournament:, csp:)
-        csp.add_constraint(
-          new(
-            matches: tournament.matches.values.flatten,
-            match_time: tournament.match_time
+        matches = tournament.matches.values.flatten
+        match_time = tournament.match_time
+
+        matches.combination(IN_PAIRS) do |match1, match2|
+          csp.add_constraint(
+            new(matches: [match1, match2], match_time: match_time)
           )
-        )
+        end
       end
 
       def initialize(matches:, match_time:)

data/lib/sports_manager/tournament_generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'timeout'
+
 # rubocop:disable Metrics/AbcSize
 module SportsManager
   # Public:Tournament Solver
@@ -22,7 +24,7 @@ module SportsManager
     extend Forwardable
 
     attr_reader :format, :tournament, :variables, :domains,
-                :ordering, :filtering, :csp
+                :ordering, :filtering, :lookahead, :csp, :timeout
 
     attr_accessor :days, :subscriptions, :matches, :courts, :game_length, :rest_break, :single_day_matches,
                   :tournament_type
@@ -43,13 +45,15 @@ module SportsManager
         .call
     end
 
-    def initialize(format: :cli)
+    def initialize(format: :cli, timeout: nil)
       @format = format
+      @timeout = timeout
       @days = {}
       @subscriptions = {}
       @matches = {}
       @ordering = Algorithms::Ordering::MultipleMatchesParticipant
       @filtering = Algorithms::Filtering::NoOverlap
+      @lookahead = CSP::Algorithms::Lookahead::Ac3
     end
 
     def add_day(day, start, finish)
@@ -128,7 +132,7 @@ module SportsManager
     def call
       setup
 
-      solutions = csp.solve
+      solutions = Timeout.timeout(timeout) { csp.solve }
 
       TournamentSolution
         .new(tournament: tournament, solutions: solutions)
@@ -153,6 +157,7 @@ module SportsManager
         .add_domains(domains)
         .add_ordering(ordering)
         .add_filtering(filtering)
+        .add_lookahead(lookahead)
         .add_constraint(Constraints::AllDifferentConstraint)
         .add_constraint(Constraints::NoOverlappingConstraint)
         .add_constraint(Constraints::MatchConstraint)

data/lib/sports_manager/tournament_problem_builder.rb

@@ -20,7 +20,8 @@ module SportsManager
   # csp = builder.build
   class TournamentProblemBuilder
     attr_reader :variables, :domains, :constraints, :max_solutions,
-                :filtering_algorithm, :ordering_algorithm, :tournament
+                :filtering_algorithm, :ordering_algorithm, :lookahead_algorithm,
+                :tournament
 
     MINIMUM_SOLUTIONS = 1
 
@@ -31,6 +32,7 @@ module SportsManager
 
       @filtering_algorithm = nil
       @ordering_algorithm = nil
+      @lookahead_algorithm = nil
 
       @max_solutions = MINIMUM_SOLUTIONS
 
@@ -61,6 +63,12 @@ module SportsManager
       self
     end
 
+    def add_lookahead(lookahead_algorithm_class)
+      @lookahead_algorithm = lookahead_algorithm_class
+
+      self
+    end
+
     # TODO: change to pass symbol instead of class?
     def add_constraint(constraint_class)
       @constraints |= Utils::Array.wrap(constraint_class)
@@ -79,8 +87,11 @@ module SportsManager
         variables.each do |variable|
           problem.add_variable(variable, domains: domains[variable])
         end
-        problem.add_ordering ordering(problem)
-        problem.add_filtering filtering(problem)
+
+        problem.add_ordering(ordering(problem))
+        problem.add_filtering(filtering(problem))
+        problem.add_lookahead(lookahead(problem))
+
         build_constraint(problem)
       end
     end
@@ -92,13 +103,23 @@ module SportsManager
     end
 
     def ordering(problem)
+      return if ordering_algorithm.nil?
+
       ordering_algorithm.for(problem: problem, dependency: tournament)
     end
 
     def filtering(problem)
+      return if filtering_algorithm.nil?
+
       filtering_algorithm.for(problem: problem, dependency: tournament)
     end
 
+    def lookahead(problem)
+      return if lookahead_algorithm.nil?
+
+      lookahead_algorithm.new(problem)
+    end
+
     def build_constraint(csp)
       ConstraintBuilder.build(tournament: tournament, csp: csp, constraints: constraints)
     end

data/lib/sports_manager/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SportsManager
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

data/sports-manager.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile])
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git appveyor Gemfile .rspec .rubocop])
     end
   end
   spec.bindir = 'exe'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sports-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - André Benjamim
 - Gustavo Alberto
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csp-resolver
@@ -33,8 +33,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rspec"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - MIT-LICENSE
@@ -98,7 +96,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/Rebase-BR/sports-manager
   source_code_uri: https://github.com/Rebase-BR/sports-manager
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: A Ruby tournament schedule generator tool.
 test_files: []

data/.rspec

@@ -1 +0,0 @@
---require spec_helper

data/.rubocop.yml

@@ -1,32 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-  SuggestExtensions: false
-Metrics/BlockLength:
-  Exclude:
-    - spec/**/*.rb
-Metrics/ClassLength:
-  Max: 200
-Metrics/MethodLength:
-  Max: 20
-Layout/FirstArrayElementIndentation:
-  EnforcedStyle: consistent
-Layout/FirstHashElementIndentation:
-  EnforcedStyle: consistent
-Layout/HashAlignment:
-  EnforcedLastArgumentHashStyle: always_inspect
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-Style/Documentation:
-  Enabled: false
-Layout/EndAlignment:
-  EnforcedStyleAlignWith: variable
-Style/ObjectThen:
-  EnforcedStyle: yield_self
-Naming/FileName:
-  Exclude:
-    - 'lib/sports-manager.rb'
-Style/OpenStructUse:
-  Enabled: false
-Gemspec/RequireMFA:
-  Enabled: false