glicko2 0.1.0 → 0.1.1

data/lib/glicko2.rb

@@ -1,17 +1,13 @@
-require "glicko2/version"
-require "glicko2/player"
-require "glicko2/rating_period"
-
 module Glicko2
   DEFAULT_VOLATILITY = 0.06
   DEFAULT_GLICKO_RATING = 1500.0
   DEFAULT_GLICKO_RATING_DEVIATION = 350.0
+  GLICKO_GRADIENT = 173.7178
 
-  VOLATILITY_CHANGE = 0.5
+  DEFAULT_CONFIG = {:volatility_change => 0.5}.freeze
 
   # Collection of helper methods
   class Util
-    GLICKO_GRADIENT = 173.7178
     GLICKO_INTERCEPT = DEFAULT_GLICKO_RATING
 
     # Convert from the original Glicko scale to Glicko2 scale
@@ -49,3 +45,7 @@ module Glicko2
     end
   end
 end
+
+require "glicko2/version"
+require "glicko2/player"
+require "glicko2/rating_period"

data/lib/glicko2/player.rb

@@ -24,6 +24,7 @@ module Glicko2
   #
   class Player
     TOLERANCE = 0.0000001
+    MIN_SD = DEFAULT_GLICKO_RATING_DEVIATION / GLICKO_GRADIENT
 
     attr_reader :mean, :sd, :volatility, :obj
 
@@ -32,20 +33,21 @@ module Glicko2
     #
     # @param [#rating,#rating_deviation,#volatility] obj seed values object
     # @return [Player] constructed instance.
-    def self.from_obj(obj)
+    def self.from_obj(obj, config=DEFAULT_CONFIG)
       mean, sd = Util.to_glicko2(obj.rating, obj.rating_deviation)
-      new(mean, sd, obj.volatility, obj)
+      new(mean, sd, obj.volatility, obj, config)
     end
 
     # @param [Numeric] mean player mean
     # @param [Numeric] sd player standard deviation
     # @param [Numeric] volatility player volatility
     # @param [#rating,#rating_deviation,#volatility] obj seed values object
-    def initialize(mean, sd, volatility, obj=nil)
+    def initialize(mean, sd, volatility, obj=nil, config=DEFAULT_CONFIG)
       @mean = mean
       @sd = sd
       @volatility = volatility
       @obj = obj
+      @config = config
       @e = {}
     end
 
@@ -111,8 +113,8 @@ module Glicko2
         b = Math.log(d - sd ** 2 - v)
       else
         k = 1
-        k += 1 while f(a - k * VOLATILITY_CHANGE, d, v) < 0
-        b = a - k * VOLATILITY_CHANGE
+        k += 1 while f(a - k * @config[:volatility_change], d, v) < 0
+        b = a - k * @config[:volatility_change]
       end
       fa = f(a, d, v)
       fb = f(b, d, v)
@@ -160,7 +162,7 @@ module Glicko2
     private
 
     def generate_next_without_games
-      sd_pre = Math.sqrt(sd ** 2 + volatility ** 2)
+      sd_pre = [Math.sqrt(sd ** 2 + volatility ** 2), MIN_SD].min
       self.class.new(mean, sd_pre, volatility, obj)
     end
 
@@ -183,7 +185,7 @@ module Glicko2
     end
 
     def f_part2(x)
-      (x - Math::log(volatility ** 2)) / VOLATILITY_CHANGE ** 2
+      (x - Math::log(volatility ** 2)) / @config[:volatility_change] ** 2
     end
   end
 end

data/lib/glicko2/rating_period.rb

@@ -17,8 +17,8 @@ module Glicko2
     #
     # @param [Array<#rating,#rating_deviation,#volatility>] objs seed value objects
     # @return [RatingPeriod]
-    def self.from_objs(objs)
-      new(objs.map { |obj| Player.from_obj(obj) })
+    def self.from_objs(objs, config=DEFAULT_CONFIG)
+      new(objs.map { |obj| Player.from_obj(obj, config) })
     end
 
     # Register a game with this rating period

data/lib/glicko2/version.rb

@@ -1,3 +1,3 @@
 module Glicko2
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/player_spec.rb

@@ -93,6 +93,13 @@ describe Glicko2::Player do
       p.sd.must_be_close_to Math.sqrt(@player.sd ** 2 + @player.volatility ** 2)
     end
 
+    it "must not decay rating deviation above default" do
+      @player = Glicko2::Player.from_obj(Rating.new(1500, Glicko2::DEFAULT_GLICKO_RATING_DEVIATION, 0.06))
+      p = @player.generate_next([], [])
+      p.update_obj
+      p.obj.rating_deviation.must_equal Glicko2::DEFAULT_GLICKO_RATING_DEVIATION
+    end
+
     bench_performance_linear "default" do |n|
       @player.generate_next(@others * n, @scores * n)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glicko2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -77,4 +77,3 @@ test_files:
 - spec/player_spec.rb
 - spec/rating_period_spec.rb
 - spec/util_spec.rb
-has_rdoc: