sportdb 1.9.0 → 1.9.1

data/lib/sportdb/calc.rb

@@ -50,6 +50,12 @@ module StandingsHelper
 
 
   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.)
@@ -70,7 +76,7 @@ module StandingsHelper
 
     events.each do |event|
       puts "  update standings for #{event.title}"
-      recs = calc_stats( event.games )
+      recs = calc_stats( event.games, opts )
 
       recs.each do |team_key, rec|
         alltime_rec = alltime_recs[ team_key ] || Stats.new
@@ -129,7 +135,7 @@ module StandingsHelper
     ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
     alltime_recs= update_ranking( alltime_recs )
 
-    pp alltime_recs
+    ## pp alltime_recs
     alltime_recs
   end
 
@@ -144,6 +150,19 @@ module StandingsHelper
     # 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)
@@ -153,7 +172,7 @@ module StandingsHelper
         next
       end
       unless g.complete?
-        puts "    !!!! skipping match - scores incomplete"
+        logger.error "[StandingsHelper.calc_stats] skipping match #{g.team1.title} - #{g.team2.title} - scores incomplete #{g.score_str}"
         next
       end
 
@@ -166,16 +185,23 @@ module StandingsHelper
 
       rec1.played += 1
       rec2.played += 1
-      
-      if g.winner == 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  += 3   # 3pts for win (hardcoded for now; change - use event setting?)
-      elsif g.winner == 2
+        rec1.pts  += pts_won
+      elsif winner == 2
         rec1.lost  += 1
         rec2.won   += 1
-        rec2.pts   += 3  # 3pts for win (hardcoded for now; change - use event setting?)
-      else ## assume == 0 (drawn)
+        rec2.pts   += pts_won
+      else  ## assume drawn/tie (that is, 0)
         rec1.drawn += 1
         rec2.drawn += 1
         rec1.pts   += 1
@@ -190,12 +216,12 @@ module StandingsHelper
 
       ## 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?
+      
+      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

data/lib/sportdb/models/game.rb

@@ -45,6 +45,25 @@ class Game < ActiveRecord::Base
   def draw?   () winner == 0; end    # use different name; use an alias (any better names more speaking???)
 
 
+
+  ## winner after extra time  (will ignore possible penalty shootout; used for alltime standings in world cup calc, for example)
+  ## - also add winnerp nil,1,2   => nil -> no penalty shoutout (or no scores) -- needed for what?
+  def winneret
+      ## check for extra time
+      if score1et.present? && score2et.present?
+        if score1et > score2et
+          1
+        elsif score1et < score2et
+          2
+        else # assume score1et == score2et - draw
+          0
+        end
+      else
+        nil  # no extra time; note: return nil  use  winneret || winner90 to get result for both extra time or if not present regular time
+      end
+  end
+
+
   def calc_winner
     if score1.nil? || score2.nil?
       self.winner90 = nil

data/lib/sportdb/models/stats/event_standing.rb

@@ -12,10 +12,10 @@ class EventStanding < ActiveRecord::Base
   belongs_to :event
 
   ## convenience helper; recalcs all records
-  def self.recalc!()  self.order(:id).each { |rec| rec.recalc! };  end
+  def self.recalc!( opts={} )  self.order(:id).each { |rec| rec.recalc!(opts) };  end
 
 
-  def recalc!
+  def recalc!( opts={} )
     ##  will calculate event standing e.g.
 
     ## calc points (pts) - loop over all group games/matches
@@ -26,7 +26,7 @@ class EventStanding < ActiveRecord::Base
     # skip knockout rounds  - why? why not?
     #   make it configure-able?
 
-    recs = StandingsHelper.calc( event.games )
+    recs = StandingsHelper.calc( event.games, opts )
 
     ## - remove (if exit) old entries and add new entries
     entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)

data/lib/sportdb/models/stats/group_standing.rb

@@ -12,16 +12,16 @@ class GroupStanding < ActiveRecord::Base
   belongs_to :group
 
   ## convenience helper; recalcs all records
-  def self.recalc!()  self.order(:id).each { |rec| rec.recalc! };  end
+  def self.recalc!( opts={} )  self.order(:id).each { |rec| rec.recalc!(opts) };  end
 
 
-  def recalc!
+  def recalc!( opts={} )
     ##  will calculate group standing e.g.
  
     ## calc points (pts) - loop over all group games/matches
     # group.games.each do |game|
     # end
-    recs = StandingsHelper.calc( group.games )
+    recs = StandingsHelper.calc( group.games, opts )
 
     ## - remove (if exit) old entries and add new entries
     entries.delete_all    # note: assoc dependent set to :delete_all (defaults to :nullify)

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &73799290 !ruby/object:Gem::Requirement
+  requirement: &78635870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73799290
+  version_requirements: *78635870
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &73798730 !ruby/object:Gem::Requirement
+  requirement: &78635550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73798730
+  version_requirements: *78635550
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &73860180 !ruby/object:Gem::Requirement
+  requirement: &78635320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73860180
+  version_requirements: *78635320
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &73859880 !ruby/object:Gem::Requirement
+  requirement: &78635060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *73859880
+  version_requirements: *78635060
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &73859690 !ruby/object:Gem::Requirement
+  requirement: &78634820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73859690
+  version_requirements: *78634820
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &73859420 !ruby/object:Gem::Requirement
+  requirement: &78634560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73859420
+  version_requirements: *78634560
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &73859210 !ruby/object:Gem::Requirement
+  requirement: &78634350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73859210
+  version_requirements: *78634350
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &73858900 !ruby/object:Gem::Requirement
+  requirement: &78634090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *73858900
+  version_requirements: *78634090
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &73858630 !ruby/object:Gem::Requirement
+  requirement: &78633850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *73858630
+  version_requirements: *78633850
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73858440 !ruby/object:Gem::Requirement
+  requirement: &78653900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73858440
+  version_requirements: *78653900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73858130 !ruby/object:Gem::Requirement
+  requirement: &78653640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *73858130
+  version_requirements: *78653640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73857850 !ruby/object:Gem::Requirement
+  requirement: &78653390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *73857850
+  version_requirements: *78653390
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: