sportdb-models 1.18.5 → 2.0.1

data/test/test_winner.rb

@@ -1,95 +1,100 @@
 # encoding: utf-8
 
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_winner.rb
+
+
 require 'helper'
 
 class TestWinner < MiniTest::Test
 
   def test_1_2
-    game = Game.new
-    game.score1 = 1
-    game.score2 = 2
-    game.calc_winner
-    
-    assert_equal 2,     game.winner90
-    assert_equal 2,     game.winner
-    assert_equal true,  game.winner2?
-    assert_equal false, game.winner1?
-    assert_equal false, game.draw?
+    match = Match.new
+    match.score1 = 1
+    match.score2 = 2
+    match.calc_winner
+
+    assert_equal 2,     match.winner90
+    assert_equal 2,     match.winner
+    assert_equal true,  match.winner2?
+    assert_equal false, match.winner1?
+    assert_equal false, match.draw?
   end
 
   def test_1_1
-    game = Game.new
-    game.score1 = 1
-    game.score2 = 1
-    game.calc_winner
-    
-    assert_equal 0,     game.winner90
-    assert_equal 0,     game.winner
-    assert_equal true,  game.draw?
-    assert_equal false, game.winner1?
-    assert_equal false, game.winner2?
+    match = Match.new
+    match.score1 = 1
+    match.score2 = 1
+    match.calc_winner
+
+    assert_equal 0,     match.winner90
+    assert_equal 0,     match.winner
+    assert_equal true,  match.draw?
+    assert_equal false, match.winner1?
+    assert_equal false, match.winner2?
   end
 
   def test_2_1
-    game = Game.new
-    game.score1 = 2
-    game.score2 = 1
-    game.calc_winner
-    
-    assert_equal 1,     game.winner90
-    assert_equal 1,     game.winner
-    assert_equal true,  game.winner1?
-    assert_equal false, game.winner2?
-    assert_equal false, game.draw?
+    match = Match.new
+    match.score1 = 2
+    match.score2 = 1
+    match.calc_winner
+
+    assert_equal 1,     match.winner90
+    assert_equal 1,     match.winner
+    assert_equal true,  match.winner1?
+    assert_equal false, match.winner2?
+    assert_equal false, match.draw?
   end
 
   def test_1_1__2_1
-    game = Game.new
-    game.score1   = 1
-    game.score2   = 1
-    game.score1et = 2
-    game.score2et = 1
-    game.calc_winner
-    
-    assert_equal 0,     game.winner90
-    assert_equal 1,     game.winner
-    assert_equal true,  game.winner1?
-    assert_equal false, game.winner2?
-    assert_equal false, game.draw?
+    match = Match.new
+    match.score1   = 1
+    match.score2   = 1
+    match.score1et = 2
+    match.score2et = 1
+    match.calc_winner
+
+    assert_equal 0,     match.winner90
+    assert_equal 1,     match.winner
+    assert_equal true,  match.winner1?
+    assert_equal false, match.winner2?
+    assert_equal false, match.draw?
   end
 
   def test_1_1__2_2__3_5
-    game = Game.new
-    game.score1   = 1
-    game.score2   = 1
-    game.score1et = 2
-    game.score2et = 2
-    game.score1p  = 3
-    game.score2p  = 5
-    game.calc_winner
-
-    assert_equal 0,     game.winner90
-    assert_equal 2,     game.winner
-    assert_equal true,  game.winner2?
-    assert_equal false, game.winner1?
-    assert_equal false, game.draw?
+    match = Match.new
+    match.score1   = 1
+    match.score2   = 1
+    match.score1et = 2
+    match.score2et = 2
+    match.score1p  = 3
+    match.score2p  = 5
+    match.calc_winner
+
+    assert_equal 0,     match.winner90
+    assert_equal 2,     match.winner
+    assert_equal true,  match.winner2?
+    assert_equal false, match.winner1?
+    assert_equal false, match.draw?
   end
 
   def test_1_1_x_3_5
-    game = Game.new
-    game.score1   = 1
-    game.score2   = 1
-    game.score1et = nil
-    game.score2et = nil
-    game.score1p  = 3
-    game.score2p  = 5
-    game.calc_winner
-
-    assert_equal 0,     game.winner90
-    assert_equal 2,     game.winner
-    assert_equal true,  game.winner2?
-    assert_equal false, game.winner1?
-    assert_equal false, game.draw?
+    match = Match.new
+    match.score1   = 1
+    match.score2   = 1
+    match.score1et = nil
+    match.score2et = nil
+    match.score1p  = 3
+    match.score2p  = 5
+    match.calc_winner
+
+    assert_equal 0,     match.winner90
+    assert_equal 2,     match.winner
+    assert_equal true,  match.winner2?
+    assert_equal false, match.winner1?
+    assert_equal false, match.draw?
   end
 
 end # class TestWinner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.18.5
+  version: 2.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-29 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: sportdb-formats
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -93,156 +79,38 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- lib/sportdb/calc.rb
-- lib/sportdb/deleter.rb
-- lib/sportdb/indexers/team.rb
-- lib/sportdb/mapper_teams.rb
-- lib/sportdb/matcher.rb
 - lib/sportdb/models.rb
-- lib/sportdb/models/assoc.rb
-- lib/sportdb/models/assoc_assoc.rb
-- lib/sportdb/models/badge.rb
-- lib/sportdb/models/event.rb
-- lib/sportdb/models/event_ground.rb
-- lib/sportdb/models/event_team.rb
-- lib/sportdb/models/forward.rb
-- lib/sportdb/models/game.rb
-- lib/sportdb/models/goal.rb
-- lib/sportdb/models/ground.rb
-- lib/sportdb/models/group.rb
-- lib/sportdb/models/group_team.rb
-- lib/sportdb/models/league.rb
-- lib/sportdb/models/person.rb
-- lib/sportdb/models/roster.rb
-- lib/sportdb/models/round.rb
-- lib/sportdb/models/season.rb
-- lib/sportdb/models/stage.rb
-- lib/sportdb/models/stage_team.rb
-- lib/sportdb/models/stats/alltime_standing.rb
-- lib/sportdb/models/stats/alltime_standing_entry.rb
-- lib/sportdb/models/stats/event_standing.rb
-- lib/sportdb/models/stats/event_standing_entry.rb
-- lib/sportdb/models/stats/group_standing.rb
-- lib/sportdb/models/stats/group_standing_entry.rb
-- lib/sportdb/models/team.rb
-- lib/sportdb/models/team_compat.rb
+- lib/sportdb/models/deleter.rb
+- lib/sportdb/models/formats.rb
+- lib/sportdb/models/models/assoc.rb
+- lib/sportdb/models/models/badge.rb
+- lib/sportdb/models/models/event.rb
+- lib/sportdb/models/models/forward.rb
+- lib/sportdb/models/models/goal.rb
+- lib/sportdb/models/models/ground.rb
+- lib/sportdb/models/models/group.rb
+- lib/sportdb/models/models/league.rb
+- lib/sportdb/models/models/lineup.rb
+- lib/sportdb/models/models/match.rb
+- lib/sportdb/models/models/person.rb
+- lib/sportdb/models/models/round.rb
+- lib/sportdb/models/models/season.rb
+- lib/sportdb/models/models/stage.rb
+- lib/sportdb/models/models/stats/alltime_standing.rb
+- lib/sportdb/models/models/stats/event_standing.rb
+- lib/sportdb/models/models/stats/group_standing.rb
+- lib/sportdb/models/models/team.rb
+- lib/sportdb/models/models/world/city.rb
+- lib/sportdb/models/models/world/continent.rb
+- lib/sportdb/models/models/world/country.rb
+- lib/sportdb/models/models/world/state.rb
+- lib/sportdb/models/schema.rb
+- lib/sportdb/models/stats.rb
 - lib/sportdb/models/utils.rb
-- lib/sportdb/models/world/city.rb
-- lib/sportdb/models/world/continent.rb
-- lib/sportdb/models/world/country.rb
-- lib/sportdb/models/world/state.rb
-- lib/sportdb/patterns.rb
-- lib/sportdb/pretty_printer.rb
-- lib/sportdb/reader.rb
-- lib/sportdb/reader_file.rb
-- lib/sportdb/reader_zip.rb
-- lib/sportdb/readers/assoc.rb
-- lib/sportdb/readers/event.rb
-- lib/sportdb/readers/event_meta.rb
-- lib/sportdb/readers/event_table.rb
-- lib/sportdb/readers/game.rb
-- lib/sportdb/readers/ground.rb
-- lib/sportdb/readers/league.rb
-- lib/sportdb/readers/season.rb
-- lib/sportdb/readers/squad_club.rb
-- lib/sportdb/readers/squad_national_team.rb
-- lib/sportdb/readers/team.rb
-- lib/sportdb/rsssf_reader.rb
-- lib/sportdb/schema.rb
-- lib/sportdb/standings.rb
-- lib/sportdb/stats.rb
-- lib/sportdb/utils.rb
-- lib/sportdb/utils_date.rb
-- lib/sportdb/utils_goals.rb
-- lib/sportdb/utils_group.rb
-- lib/sportdb/utils_map.rb
-- lib/sportdb/utils_round.rb
-- lib/sportdb/utils_scores.rb
-- lib/sportdb/utils_teams.rb
-- lib/sportdb/version.rb
-- test/data/at-austria/2013_14/bl.txt
-- test/data/at-austria/2013_14/bl.yml
-- test/data/at-austria/2013_14/bl_ii.txt
-- test/data/at-austria/2013_14/el.txt
-- test/data/at-austria/2013_14/el.yml
-- test/data/at-austria/2013_14/squads/austria.txt
-- test/data/at-austria/2013_14/squads/salzburg.txt
-- test/data/at-austria/2014_15/1-bundesliga-ii.txt
-- test/data/at-austria/2014_15/1-bundesliga.yml
-- test/data/at-austria/2015_16/1-bundesliga-v2.conf.txt
-- test/data/at-austria/2015_16/1-bundesliga-v2.yml
-- test/data/at-austria/2015_16/1-bundesliga.conf.txt
-- test/data/at-austria/2015_16/1-bundesliga.yml
-- test/data/at-austria/2015_16/cup.yml
-- test/data/at-austria/leagues.txt
-- test/data/at-austria/teams.txt
-- test/data/at-austria/teams_2.txt
-- test/data/csv/de-2013-14--1-bundesliga.txt
-- test/data/de-deutschland/2013-14/1-bundesliga.yml
-- test/data/de-deutschland/leagues.txt
-- test/data/de-deutschland/teams.txt
-- test/data/eng-england/2015-16/1-premierleague-v2.yml
-- test/data/eng-england/2015-16/1-premierleague.yml
-- test/data/national-teams/assocs.txt
-- test/data/national-teams/europe/assocs.txt
-- test/data/national-teams/europe/teams.txt
-- test/data/national-teams/north-america/assocs.txt
-- test/data/national-teams/north-america/teams.txt
-- test/data/national-teams/teams.txt
-- test/data/players/europe/at-austria/players.txt
-- test/data/players/europe/de-deutschland/players.txt
-- test/data/players/south-america/br-brazil/players.txt
-- test/data/rsssf/at-2014-15--1-bundesliga.txt
-- test/data/rsssf/at-2015-16--1-bundesliga.txt
-- test/data/world-cup/1930/cup.txt
-- test/data/world-cup/1930/cup.yml
-- test/data/world-cup/1930/cup_goals.txt
-- test/data/world-cup/1930/cup_goals.yml
-- test/data/world-cup/1954/cup.txt
-- test/data/world-cup/1954/cup.yml
-- test/data/world-cup/1962/cup.txt
-- test/data/world-cup/1962/cup.yml
-- test/data/world-cup/1974/cup.yml
-- test/data/world-cup/1974/cup_finals.txt
-- test/data/world-cup/1974/cup_i.txt
-- test/data/world-cup/1974/cup_ii.txt
-- test/data/world-cup/2014/cup.txt
-- test/data/world-cup/2014/cup.yml
-- test/data/world-cup/2014/squads/br-brazil.txt
-- test/data/world-cup/2014/squads/de-deutschland.txt
-- test/data/world-cup/2014/squads/jp-japan.txt
-- test/data/world-cup/2014/squads/uy-uruguay.txt
-- test/data/world-cup/leagues.txt
-- test/data/world-cup/seasons_1930.txt
-- test/data/world-cup/seasons_1954.txt
-- test/data/world-cup/seasons_1962.txt
-- test/data/world-cup/seasons_1974.txt
-- test/data/world-cup/teams_1930.txt
-- test/data/world-cup/teams_1954.txt
-- test/data/world-cup/teams_1962.txt
-- test/data/world-cup/teams_1974.txt
+- lib/sportdb/models/version.rb
 - test/helper.rb
-- test/test_assoc_reader.rb
 - test/test_changes.rb
 - test/test_cursor.rb
-- test/test_event_meta_reader.rb
-- test/test_event_reader.rb
-- test/test_event_table_reader.rb
-- test/test_goals.rb
-- test/test_indexer_team.rb
-- test/test_load.rb
-- test/test_pp.rb
-- test/test_reader.rb
-- test/test_reader_from_string.rb
-- test/test_round_auto.rb
-- test/test_round_def.rb
-- test/test_round_header.rb
-- test/test_rsssf_reader.rb
-- test/test_squad_club_reader.rb
-- test/test_squad_national_team_reader.rb
-- test/test_standings.rb
-- test/test_standings_ii.rb
-- test/test_utils.rb
 - test/test_winner.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:

data/lib/sportdb/calc.rb

@@ -1,279 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-############
-##
-##  fix/todo: obsolete
-##   - use new Standings class 
-
-
-##############################################
-# helper/ builds standings table in memory
-#  - find a better module name for StandingsHelper ?? why? why not?
-
-
-module StandingsHelper
-
-  ## todo:
-  ##  add team_id to struct - why? why not?  - saves a db lookup?
-  class Stats
-     ### fix/todo: change/rename :pos to :rank
-     attr_accessor :pos, :played, :won, :lost, :drawn,
-                   :goals_for, :goals_against, :pts,
-                   :recs
-
-     def initialize
-       @pos           = nil    # use 0? why? why not?
-       @played        = 0
-       @won           = 0
-       @lost          = 0
-       @drawn         = 0
-       @goals_for     = 0
-       @goals_against = 0
-       @pts           = 0
-       @recs          = 0
-       # note: appearances (event) count  or similar
-       #   is recs counter (number of (stats) records)
-     end
-
-     def add( rec )
-       ### fix: add plus + operator too!
-       
-       # note: will NOT update/add pos (ranking)
-       self.played        += rec.played
-       self.won           += rec.won
-       self.lost          += rec.lost
-       self.drawn         += rec.drawn
-       self.goals_for     += rec.goals_for
-       self.goals_against += rec.goals_against
-       self.pts           += rec.pts
-       self.recs          += rec.recs
-
-       self # return self stats rec
-     end # method add
-  end  # class Stats
-
-
-  def self.calc( games, opts={} )
-     
-     ##
-     #  possible opts include:
-     #    pts_won:              3 or 2 or n   (default 3)
-     #    pts_exclude_scorep    false or true (default false)  -- exclude penalty shotout scores (e.g. count a draw/tie - no winner)
-     #
-    recs = calc_stats( games, opts )
-
-    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
-    recs= update_ranking( recs )
-
-    pp recs
-    recs
-  end
-
-
-
-  def self.calc_for_events( events, opts={} )
-
-    ## todo:
-    ##  - add tracker for appeareances (stats records counter)
-
-    alltime_recs = {}  # stats recs indexed by team_key
-
-    events.each do |event|
-      puts "  update standings for #{event.title}"
-      recs = calc_stats( event.games, opts )
-
-      recs.each do |team_key, rec|
-        alltime_rec = alltime_recs[ team_key ] || Stats.new
-
-        ## add stats values
-        alltime_rec.add( rec )
-
-        alltime_recs[ team_key ] = alltime_rec 
-      end
-    end
-
-
-    ### fix:
-    # - make merge team into a helper method (for reuse)
-
-    ## check for merging teams
-    # e.g. all time world cup
-    #   Germany incl. West Germany
-    #   Russia  incl. Soviet Union etc.
-    
-    # todo: change opts para to :includes  instead of :merge ? why? why not??
-
-    merge = opts[:merge]
-    if merge
-      puts "  merging teams (stats records):"
-      pp merge
-
-      merge.each do |k,v|
-        # note: assume key is destition team key and
-        #         value is source team key  e.g.  'GER' => 'FRG'
-        #         or array (for mulitple teamss e.g.  'GER' => ['FRG','GDR']
-        team_key_dest = k.to_s
-
-        if v.kind_of? Array
-          team_keys_src = v
-        else
-          team_keys_src = [v]    # turn single value arg into array w/ single item
-        end
-        team_keys_src = team_keys_src.map { |src| src.to_s }  # turn all to string (might be symbol)
-
-        alltime_rec_dest = alltime_recs[ team_key_dest ] || Stats.new
-
-        team_keys_src.each do |team_key_src|
-          alltime_rec_src  = alltime_recs[ team_key_src]
-
-          if alltime_rec_src  # stats record found?
-            alltime_rec_dest.add( alltime_rec_src )  # add stats values
-            alltime_recs.delete( team_key_src )      # remove old src entry
-          end
-        end
-
-        alltime_recs[ team_key_dest ] = alltime_rec_dest
-      end
-    end
-
-    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
-    alltime_recs= update_ranking( alltime_recs )
-
-    ## pp alltime_recs
-    alltime_recs
-  end
-
-
-
-  def self.calc_stats( games, opts={} )
-
-    ## fix:
-    #   passing in e.g. pts for win (3? 2? etc.)
-    #    default to 3 for now
-
-    # note:
-    #   returns stats records w/ stats records counter always set to one (recs==1)
-
-    ## todo/fix: find a better way to include logger (do NOT hardcode usage of root logger)!!!
-    logger = LogUtils::Logger.root
-
-
-    ## lets you pass in 2 as an alterantive, for example
-    pts_won  = opts[:pts_won] || 3
-
-    ## lets you exclude penalty shootout (e.g. match gets scored as draw/tie 1 pt each)
-    #  e.g. why? used for alltime standings formula in world cup, for example
-    #   todo: check other standings - exclude penalty shootout too - e.g. championsleague ?? if yes - make it true as default??
-    pts_exclude_scorep = opts[:pts_exclude_scorep].present? ? opts[:pts_exclude_scorep] : false
-
-
-    recs = {}
-
-    games.each_with_index do |g,i|   # note: index(i) starts w/ zero (0)
-      puts "  [#{i+1}] #{g.team1.title} - #{g.team2.title}  #{g.score_str}"
-      unless g.over?
-        puts "    !!!! skipping match - not yet over (play_at date in the future)"
-        next
-      end
-      unless g.complete?
-        logger.error "[StandingsHelper.calc_stats] skipping match #{g.team1.title} - #{g.team2.title} - scores incomplete #{g.score_str}"
-        next
-      end
-
-      rec1 = recs[ g.team1.key ] || Stats.new
-      rec2 = recs[ g.team2.key ] || Stats.new
-
-      ## set stats records counter to one if new (first) record update 
-      rec1.recs = 1   if rec1.recs == 0
-      rec2.recs = 1   if rec2.recs == 0
-
-      rec1.played += 1
-      rec2.played += 1
-
-      ## check - if winner (excludes penalty shootout scores in calc? start w/ extra time e.g winneret)
-      if pts_exclude_scorep
-         winner = g.winneret || g.winner90     ## if no extra time (et) score; try 90min (regular time score)
-      else
-         winner = g.winner   ## note: might include penalty shoot scores
-      end
-
-      if winner == 1
-        rec1.won  += 1
-        rec2.lost += 1
-        rec1.pts  += pts_won
-      elsif winner == 2
-        rec1.lost  += 1
-        rec2.won   += 1
-        rec2.pts   += pts_won
-      else  ## assume drawn/tie (that is, 0)
-        rec1.drawn += 1
-        rec2.drawn += 1
-        rec1.pts   += 1
-        rec2.pts   += 1
-      end
-
-      rec1.goals_for     += g.score1
-      rec1.goals_against += g.score2
-      
-      rec2.goals_for     += g.score2
-      rec2.goals_against += g.score1
-
-      ## add overtime and penalty??
-      ##  - for now add only overtime if present
-      
-      rec1.goals_for     += (g.score1et-g.score1)  if g.score1et.present?
-      rec1.goals_against += (g.score2et-g.score2)  if g.score2et.present?
-
-      rec2.goals_for     += (g.score2et-g.score2)  if g.score2et.present?
-      rec2.goals_against += (g.score1et-g.score1)  if g.score1et.present?
-
-      recs[ g.team1.key ] = rec1
-      recs[ g.team2.key ] = rec2
-    end  # each game
-
-    recs # return records; hash indexed by team key
-  end # method calc
-
-
-  def self.update_ranking( recs )
-    #############################
-    ### calc ranking / pos
-    ##
-    ## fix/allow sampe pos e.g. all 1 or more than one team 3rd etc.
-    ##   see sportbook for an example
-
-    # build array from hash
-    ary = []
-    recs.each do |k,v|
-      ary << [k,v]
-    end
-
-    ary.sort! do |l,r|
-      ## note: reverse order (thus, change l,r to r,l)
-      value =  r[1].pts <=> l[1].pts
-      if value == 0    # same pts try goal diff
-        value =   (r[1].goals_for-r[1].goals_against) <=> (l[1].goals_for-l[1].goals_against)
-        if value == 0  # same goal diff too; try assume more goals better for now
-          value =   r[1].goals_for <=> l[1].goals_for
-        end
-      end
-      value
-    end
-
-    ## update pos using ordered array
-    ary.each_with_index  do |rec,i|
-      k = rec[0]
-      v = rec[1]
-      v.pos = i+1    ## add ranking (e.g. 1,2,3 etc.)  - note: i starts w/ zero (0)
-      recs[ k ] = v   ## update recs
-    end
-    
-    recs
-  end # method update_ranking
-
-  
-end # module StandingsHelper
-
-end # module SportDb