basketball 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eade2dd71d031c05eaf7e5fa792056d9ee6621f6168c6cbd288e5106f0fe4c3a
-  data.tar.gz: 66b92eb67dd64d84288dc5869b2076753d043311e22d903d4d8e5468ea90f7f6
+  metadata.gz: 29805ef216312c25dee77d7f7c2a82bf220287404e9e241d24e16dddfb895fcc
+  data.tar.gz: 3d8a0038acf62e4e1aa230299cc1b2d7d777596bc133b159b1e661639c75c76d
 SHA512:
-  metadata.gz: 72a89afec17d978e79dd979a50188c62c19532a77143312a79f387a182cab5988a7e90399be60f019ce3a5d6639f5eb0ddc3f14ca896e5f3c3496488be3427de
-  data.tar.gz: 4f04e99ddd1e64ad893395264c5753b975f4c46b741324d53bd125c1f2a8daa2079c44e2a85fd52bf6dd24d7b09fcf29c5f9266db4c67da19e8f952884de8a72
+  metadata.gz: ae3baac2215dbfee6b9cf70a44b2bdf9257d7dade811c6a30bf37b22f840bd85621f6441d137e07f38b615210092d0cede011a2e9f4655aa1e05c6281411a856
+  data.tar.gz: 4bcb67de94178f2945376faa2cb57c5f5884d60b24479d73e12d1145c7c20c1b9f3dd547f321c578f39d43868fb2f8d158859020b14d7e436fbface8a89b2809

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-#### 0.0.1 - May 4th, 2023
+#### 0.0.3 - May 5th, 2023
+
+* Drafting::Engine#sim! should return events
+* Added Drafting::Engine#undrafted_player_search
+
+#### 0.0.2 - May 4th, 2023
 
 * Remove autoloading in favor of require statements.
 

data/lib/basketball/drafting/engine.rb

@@ -98,12 +98,13 @@ module Basketball
 
       def sim!(times = nil)
         counter = 0
+        events  = []
 
         until done? || (times && counter >= times)
           team = current_team
 
           player = team.pick(
-            undrafted_players:,
+            undrafted_player_search:,
             drafted_players: drafted_players(team),
             round: current_round
           )
@@ -122,9 +123,10 @@ module Basketball
           yield(event) if block_given?
 
           counter += 1
+          events << event
         end
 
-        self
+        events
       end
 
       def pick!(player)
@@ -146,6 +148,10 @@ module Basketball
         players - drafted_players
       end
 
+      def undrafted_player_search
+        PlayerSearch.new(undrafted_players)
+      end
+
       private
 
       attr_reader :players_by_id, :teams_by_id

data/lib/basketball/drafting/engine_serializer.rb

@@ -101,7 +101,7 @@ module Basketball
               first_name: player.first_name,
               last_name: player.last_name,
               overall: player.overall,
-              position: player.position.value
+              position: player.position.code
             }
           ]
         end

data/lib/basketball/drafting/event.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Event < Entity

data/lib/basketball/drafting/front_office.rb

@@ -2,16 +2,18 @@
 
 module Basketball
   module Drafting
-    class FrontOffice
+    class FrontOffice < ValueObject
       MAX_DEPTH     = 3
       MAX_FUZZ      = 2
       MAX_POSITIONS = 12
 
       private_constant :MAX_DEPTH, :MAX_FUZZ, :MAX_POSITIONS
 
-      attr_reader :prioritized_positions, :fuzz, :depth
+      attr_reader_value :prioritized_positions, :fuzz, :depth
 
       def initialize(prioritized_positions: [], fuzz: rand(0..MAX_FUZZ), depth: rand(0..MAX_DEPTH))
+        super()
+
         @fuzz                  = fuzz.to_i
         @depth                 = depth.to_i
         @prioritized_positions = prioritized_positions
@@ -24,44 +26,36 @@ module Basketball
         freeze
       end
 
-      def to_s
-        "#{prioritized_positions.map(&:to_s).join(',')} (F:#{fuzz} D:#{depth})"
-      end
-
-      def pick(undrafted_players:, drafted_players:, round:)
+      def pick(undrafted_player_search:, drafted_players:, round:)
         players = []
 
-        players = adaptive_search(undrafted_players:, drafted_players:) if depth >= round
-        players = balanced_search(undrafted_players:, drafted_players:) if players.empty?
-        players = top_players(undrafted_players:)                       if players.empty?
+        players = adaptive_search(undrafted_player_search:, drafted_players:) if depth >= round
+        players = balanced_search(undrafted_player_search:, drafted_players:) if players.empty?
+        players = top_players(undrafted_player_search:)                       if players.empty?
 
         players[0..fuzz].sample
       end
 
       private
 
-      def adaptive_search(undrafted_players:, drafted_players:)
-        search = PlayerSearch.new(undrafted_players)
-
+      def adaptive_search(undrafted_player_search:, drafted_players:)
         drafted_positions = drafted_players.map(&:position)
 
-        search.query(exclude_positions: drafted_positions)
+        undrafted_player_search.query(exclude_positions: drafted_positions)
       end
 
-      def balanced_search(undrafted_players:, drafted_players:)
-        search = PlayerSearch.new(undrafted_players)
-
+      def balanced_search(undrafted_player_search:, drafted_players:)
         players = []
 
         # Try to find best pick for exact desired position.
         # If you cant find one, then move to the next desired position until the end of the queue
         available_prioritized_positions(drafted_players:).each do |position|
-          players = search.query(position:)
+          players = undrafted_player_search.query(position:)
 
           break if players.any?
         end
 
-        players = players.any? ? players : search.query
+        players = players.any? ? players : undrafted_player_search.query
       end
 
       def all_random_positions

data/lib/basketball/drafting/player.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Player < Entity

data/lib/basketball/drafting/position.rb

@@ -2,7 +2,7 @@
 
 module Basketball
   module Drafting
-    class Position
+    class Position < ValueObject
       extend Forwardable
 
       class << self
@@ -17,25 +17,18 @@ module Basketball
       FRONT_COURT_VALUES = %w[PF C].to_set.freeze
       ALL_VALUES         = (BACK_COURT_VALUES.to_a + FRONT_COURT_VALUES.to_a).to_set.freeze
 
-      attr_reader :value
+      attr_reader_value :code
 
-      def_delegators :value, :to_s
+      def_delegators :code, :to_s
 
-      def initialize(value)
-        @value = value.to_s.upcase
+      def initialize(code)
+        super()
 
-        raise InvalidPositionError, "Unknown position value: #{@value}" unless ALL_VALUES.include?(@value)
+        @code = code.to_s.upcase
 
-        freeze
-      end
+        raise InvalidPositionError, "Unknown position code: #{@code}" unless ALL_VALUES.include?(@code)
 
-      def ==(other)
-        value == other.value
-      end
-      alias eql? ==
-
-      def hash
-        value.hash
+        freeze
       end
     end
   end

data/lib/basketball/drafting/roster.rb

@@ -2,16 +2,18 @@
 
 module Basketball
   module Drafting
-    class Roster
+    class Roster < ValueObject
       extend Forwardable
 
       class WrongTeamEventError < StandardError; end
 
-      attr_reader :team, :events
+      attr_reader_value :team, :events
 
       def_delegators :team, :id
 
       def initialize(team:, events: [])
+        super()
+
         raise ArgumentError, 'team is required' unless team
 
         other_teams_pick_event_ids = events.reject { |e| e.team == team }.map(&:id)

data/lib/basketball/drafting/sim_event.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'event'
-
 module Basketball
   module Drafting
     class SimEvent < Event

data/lib/basketball/drafting/team.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'entity'
-
 module Basketball
   module Drafting
     class Team < Entity
+      extend Forwardable
+
       attr_reader :name, :front_office
 
+      def_delegators :front_office, :pick
+
       def initialize(id:, name: '', front_office: FrontOffice.new)
         super(id)
 
@@ -21,10 +23,6 @@ module Basketball
       def to_s
         "[#{super}] #{name}"
       end
-
-      def pick(undrafted_players:, drafted_players:, round:)
-        front_office.pick(undrafted_players:, drafted_players:, round:)
-      end
     end
   end
 end

data/lib/basketball/entity.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Basketball
+  class Entity
+    extend Forwardable
+    include Comparable
+
+    attr_reader :id
+
+    def_delegators :id, :to_s
+
+    def initialize(id)
+      raise ArgumentError, 'id is required' if id.to_s.empty?
+
+      @id = id.to_s.upcase
+    end
+
+    def <=>(other)
+      id <=> other.id
+    end
+
+    def ==(other)
+      id == other.id
+    end
+    alias eql? ==
+
+    def hash
+      id.hash
+    end
+  end
+end

data/lib/basketball/value_object.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Basketball
+  class ValueObject
+    include Comparable
+
+    # NOTE: This current implementation most likely does not work for deep inheritance trees.
+    class << self
+      def value_keys
+        @value_keys ||= []
+      end
+
+      def sorted_value_keys
+        value_keys.sort
+      end
+
+      def attr_reader_value(*keys)
+        keys.each { |k| value_keys << k.to_sym }
+
+        attr_reader(*keys)
+      end
+    end
+
+    def to_s
+      to_h.map { |k, v| "#{k}: #{v}" }.join(', ')
+    end
+
+    def to_h
+      self.class.sorted_value_keys.to_h { |k| [k, send(k)] }
+    end
+
+    def [](key)
+      to_h[key]
+    end
+
+    def <=>(other)
+      all_sorted_values <=> other.all_sorted_values
+    end
+
+    def ==(other)
+      to_h == other.to_h
+    end
+    alias eql? ==
+
+    def hash
+      all_sorted_values.map(&:hash).hash
+    end
+
+    def all_sorted_values
+      self.class.sorted_value_keys.map { |k| self[k] }
+    end
+  end
+end

data/lib/basketball/version.rb

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

data/lib/basketball.rb

@@ -7,4 +7,9 @@ require 'json'
 require 'securerandom'
 require 'slop'
 
+# Top-level
+require_relative 'basketball/entity'
+require_relative 'basketball/value_object'
+
+# Submodules
 require_relative 'basketball/drafting'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basketball
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew Ruggio
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
@@ -207,7 +207,6 @@ files:
 - lib/basketball/drafting/cli.rb
 - lib/basketball/drafting/engine.rb
 - lib/basketball/drafting/engine_serializer.rb
-- lib/basketball/drafting/entity.rb
 - lib/basketball/drafting/event.rb
 - lib/basketball/drafting/front_office.rb
 - lib/basketball/drafting/pick_event.rb
@@ -217,6 +216,8 @@ files:
 - lib/basketball/drafting/roster.rb
 - lib/basketball/drafting/sim_event.rb
 - lib/basketball/drafting/team.rb
+- lib/basketball/entity.rb
+- lib/basketball/value_object.rb
 - lib/basketball/version.rb
 homepage: https://github.com/mattruggio/basketball
 licenses:

data/lib/basketball/drafting/entity.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module Basketball
-  module Drafting
-    class Entity
-      extend Forwardable
-      include Comparable
-
-      attr_reader :id
-
-      def_delegators :id, :to_s
-
-      def initialize(id)
-        raise ArgumentError, 'id is required' if id.to_s.empty?
-
-        @id = id.to_s.upcase
-      end
-
-      def <=>(other)
-        id <=> other.id
-      end
-
-      def ==(other)
-        id == other.id
-      end
-      alias eql? ==
-
-      def hash
-        id.hash
-      end
-    end
-  end
-end