skillz 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9668abe2cc46fea6d1be7f4d83d010b3b448db83
-  data.tar.gz: 7d43232d6d2350c5ec6837abd1308c4b9f56e926
+  metadata.gz: 9aafccb1b92151740adced826a83b7fd56202086
+  data.tar.gz: 5d115d6930f74526772a8155f90e15b5934ac5cd
 SHA512:
-  metadata.gz: e3a2d5f7ef1721ca20c7a508ecaa3de5cdd49248aba75dd625568de26dfbef4ddf6ec41593f70774aa33a8fe86ef5c795ecf8e8e0e5b1a82b8a9e533d0e01115
-  data.tar.gz: 3efb7706bf2a463910c45ff20948c680990928394310bffa93e7813daa876a25a4635e426a2a8dd39fe20532610f14221a8b6a4c4b9b27cb147e150211895c96
+  metadata.gz: aebf90293ad5a8af150067ce186160f2489dddc2aaf13216f475e41c7f2d8a854d8da8202ae09243b14769f3c2401cf26b4e5025b3d5f1cd25a54a90e11c55b8
+  data.tar.gz: b6401741ab2288dcec785e8161e60f49e31b656a2c6123a7daa0d776d960205b934353cc65e8fa1afd5c56a0fdecff76c729705c8ad59cea5e79672459502ffa

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode

data/README.md

@@ -38,7 +38,7 @@ Or install it yourself as:
     team2 = Skillz::Team.new([p3, p4], 2)
 
     Skillz::Match.score(Skillz::Team.new([p1, p2], 1), Skillz::Team.new([p2], 2))
-    # players are now update with their new skill_level and uncertainty_in_skill_level
+    # players are now update with their new skill_level and skill_uncertainty
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+1.0.0

data/lib/skillz/match.rb

@@ -28,9 +28,9 @@ module Skillz
         end
 
         team1.players.map do |player|
-          uncertainty_squared = player.uncertainty_in_skill_level**2
+          uncertainty_squared = player.skill_uncertainty**2
           player.skill_level += uncertainty_squared/team1.uncertainty * omega
-          player.uncertainty_in_skill_level *= Math.sqrt([1 - uncertainty_squared / team1.uncertainty * delta, 0.0001].max)
+          player.skill_uncertainty *= Math.sqrt([1 - uncertainty_squared / team1.uncertainty * delta, 0.0001].max)
           player
         end
       end

data/lib/skillz/player.rb

@@ -1,21 +1,29 @@
+require 'securerandom'
+
 module Skillz
   class Player
 
-    attr_accessor :skill_level, :uncertainty_in_skill_level
+    attr_accessor :skill_level, :skill_uncertainty, :temporary_id
 
-    def initialize(skill_level=nil, uncertainty=nil, last_match_time=nil)
+    def initialize(skill_level=nil, uncertainty=nil, last_match_time=nil, temporary_id=nil)
       @skill_level = skill_level || Skillz::INITIAL_SKILL_LEVEL
-      @uncertainty_in_skill_level = uncertainty || Skillz::UNCERTAINTY
-      if last_match_time
-        days = (Time.now - last_match_time).to_i / (24 * 60 * 60)
-        time_decay = 1 + -Math.exp((days * -1.0)/365)
-        time_decay *= [[uncertainty_in_skill_level, 4].max, 10].min
-        @uncertainty_in_skill_level += time_decay
-      end
+      @skill_uncertainty = uncertainty || Skillz::UNCERTAINTY
+      @temporary_id = temporary_id || SecureRandom.uuid
+      adjust_for_inactivity(last_match_time) if last_match_time
     end
 
     def adjusted_skill_level
-      @skill_level - @uncertainty_in_skill_level
+      @skill_level - (@skill_uncertainty * 0.5)
+    end
+
+    private
+
+    def adjust_for_inactivity(last_match_time)
+      days = (Time.now - last_match_time).to_i / (24 * 60 * 60)
+      return if days <= 25
+      time_decay = 1 - Math.exp((days * -1.0)/365)
+      time_decay *= [[skill_uncertainty, 4].max, 10].min
+      @skill_uncertainty += time_decay
     end
   end
 end

data/lib/skillz/team.rb

@@ -15,7 +15,7 @@ module Skillz
     def uncertainty
       @uncertainty_squared ||= begin
         @players.map do |player|
-          player.uncertainty_in_skill_level * player.uncertainty_in_skill_level
+          player.skill_uncertainty * player.skill_uncertainty
         end.sum
       end
     end

data/skillz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "skillz"
-  s.version = "0.0.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["frausto"]
-  s.date = "2013-08-16"
+  s.date = "2014-04-05"
   s.description = "A ruby library implementing a competitive ranking system based on trueskill and other similar systems. Built to address issues such as cheating, tournaments, team-play, matching, etc.. "
   s.email = "nrfrausto@gmail.com"
   s.extra_rdoc_files = [

data/spec/skillz/match_spec.rb

@@ -43,22 +43,22 @@ describe Skillz::Match do
     end
   end
 
-  describe 'uncertainty_in_skill_level' do
+  describe 'skill_uncertainty' do
     it "one ceratin player beats uncertain player" do
       p1 = Skillz::Player.new(25, 2.3)
       p2 = Skillz::Player.new(25, 10)
 
       p1.skill_level.should == 25
       p2.skill_level.should == 25
-      p1.uncertainty_in_skill_level.should == 2.3
-      p2.uncertainty_in_skill_level.should == 10
+      p1.skill_uncertainty.should == 2.3
+      p2.skill_uncertainty.should == 10
 
       Skillz::Match.score(Skillz::Team.new([p1], 1), Skillz::Team.new([p2], 2))
 
       p1.skill_level.round(7).should == 25.2235335
       p2.skill_level.round(7).should == 20.7744132
-      p1.uncertainty_in_skill_level.round(7).should == 2.2978876
-      p2.uncertainty_in_skill_level.round(7).should == 9.2146587
+      p1.skill_uncertainty.round(7).should == 2.2978876
+      p2.skill_uncertainty.round(7).should == 9.2146587
     end
 
     it "one unceratin player beats certain player" do
@@ -67,15 +67,15 @@ describe Skillz::Match do
 
       p1.skill_level.should == 25
       p2.skill_level.should == 25
-      p1.uncertainty_in_skill_level.should == 2.3
-      p2.uncertainty_in_skill_level.should == 10
+      p1.skill_uncertainty.should == 2.3
+      p2.skill_uncertainty.should == 10
 
       Skillz::Match.score(Skillz::Team.new([p1], 2), Skillz::Team.new([p2], 1))
 
       p1.skill_level.round(7).should == 24.7764665
       p2.skill_level.round(7).should == 29.2255868
-      p1.uncertainty_in_skill_level.round(7).should == 2.2978876
-      p2.uncertainty_in_skill_level.round(7).should == 9.2146587
+      p1.skill_uncertainty.round(7).should == 2.2978876
+      p2.skill_uncertainty.round(7).should == 9.2146587
     end
 
 
@@ -83,8 +83,8 @@ describe Skillz::Match do
       p1 = Skillz::Player.new(30, 9.9)
       p2 = Skillz::Player.new(10, 3)
 
-      p1.uncertainty_in_skill_level.should == 9.9
-      p2.uncertainty_in_skill_level.should == 3
+      p1.skill_uncertainty.should == 9.9
+      p2.skill_uncertainty.should == 3
       p1.skill_level.should == 30
       p2.skill_level.should == 10
 
@@ -92,8 +92,8 @@ describe Skillz::Match do
 
       p1.skill_level.round(7).should == 23.0607762
       p2.skill_level.round(7).should == 10.6372106
-      p1.uncertainty_in_skill_level.round(7).should == 9.5156031
-      p2.uncertainty_in_skill_level.round(7).should == 2.9968199
+      p1.skill_uncertainty.round(7).should == 9.5156031
+      p2.skill_uncertainty.round(7).should == 2.9968199
     end
 
 
@@ -101,8 +101,8 @@ describe Skillz::Match do
       p1 = Skillz::Player.new(30, 9.9)
       p2 = Skillz::Player.new(10, 3)
 
-      p1.uncertainty_in_skill_level.should == 9.9
-      p2.uncertainty_in_skill_level.should == 3
+      p1.skill_uncertainty.should == 9.9
+      p2.skill_uncertainty.should == 3
       p1.skill_level.should == 30
       p2.skill_level.should == 10
 
@@ -110,16 +110,16 @@ describe Skillz::Match do
 
       p1.skill_level.round(7).should == 31.2933587
       p2.skill_level.round(7).should == 9.8812343
-      p1.uncertainty_in_skill_level.round(7).should == 9.5156031
-      p2.uncertainty_in_skill_level.round(7).should == 2.9968199
+      p1.skill_uncertainty.round(7).should == 9.5156031
+      p2.skill_uncertainty.round(7).should == 2.9968199
     end
 
     it "certain high level loses to uncertain low level player" do
       p1 = Skillz::Player.new(30, 3)
       p2 = Skillz::Player.new(10, 9.9)
 
-      p1.uncertainty_in_skill_level.should == 3
-      p2.uncertainty_in_skill_level.should == 9.9
+      p1.skill_uncertainty.should == 3
+      p2.skill_uncertainty.should == 9.9
       p1.skill_level.should == 30
       p2.skill_level.should == 10
 
@@ -127,16 +127,16 @@ describe Skillz::Match do
 
       p1.skill_level.round(7).should == 29.3627894
       p2.skill_level.round(7).should == 16.9392238
-      p1.uncertainty_in_skill_level.round(7).should == 2.9968199
-      p2.uncertainty_in_skill_level.round(7).should == 9.5156031
+      p1.skill_uncertainty.round(7).should == 2.9968199
+      p2.skill_uncertainty.round(7).should == 9.5156031
     end
 
     it "certain high level wins against uncertain low level player" do
       p1 = Skillz::Player.new(30, 3)
       p2 = Skillz::Player.new(10, 9.9)
 
-      p1.uncertainty_in_skill_level.should == 3
-      p2.uncertainty_in_skill_level.should == 9.9
+      p1.skill_uncertainty.should == 3
+      p2.skill_uncertainty.should == 9.9
       p1.skill_level.should == 30
       p2.skill_level.should == 10
 
@@ -144,8 +144,36 @@ describe Skillz::Match do
 
       p1.skill_level.round(7).should == 30.1187657
       p2.skill_level.round(7).should == 8.7066413
-      p1.uncertainty_in_skill_level.round(7).should == 2.9968199
-      p2.uncertainty_in_skill_level.round(7).should == 9.5156031
+      p1.skill_uncertainty.round(7).should == 2.9968199
+      p2.skill_uncertainty.round(7).should == 9.5156031
+    end
+
+
+    it "works for team matches" do
+      p1 = Skillz::Player.new(30, 3)
+      p2 = Skillz::Player.new(20, 9.9)
+      p3 = Skillz::Player.new(25, 7.9)
+      p4 = Skillz::Player.new(32, 4.9)
+
+      p1.skill_uncertainty.should == 3
+      p2.skill_uncertainty.should == 9.9
+      p3.skill_uncertainty.should == 7.9
+      p4.skill_uncertainty.should == 4.9
+      p1.skill_level.should == 30
+      p2.skill_level.should == 20
+      p3.skill_level.should == 25
+      p4.skill_level.should == 32
+
+      Skillz::Match.score(Skillz::Team.new([p1, p3], 1), Skillz::Team.new([p4, p2], 2))
+
+      p1.skill_level.round(7).should == 30.2684317
+      p2.skill_level.round(7).should == 17.0767787
+      p3.skill_level.round(7).should == 26.8614248
+      p4.skill_level.round(7).should == 31.2838839
+      p1.skill_uncertainty.round(7).should == 2.9917939
+      p2.skill_uncertainty.round(7).should == 9.5072471
+      p3.skill_uncertainty.round(7).should == 7.7489117
+      p4.skill_uncertainty.round(7).should == 4.8530988
     end
   end
 end

data/spec/skillz/player_spec.rb

@@ -1,10 +1,37 @@
 require 'spec_helper'
 
 describe Skillz::Player do
+  before do
+    @now = Time.now
+    Time.stub(:now => @now)
+  end
+
   it "should increase uncertainty based on when the last match was played" do
-    now = Time.now
-    Time.stub(:now => now)
-    Skillz::Player.new(25, 4, now - 60.days).uncertainty_in_skill_level.round(7).should == 4.6063338
-    Skillz::Player.new(25, 4, now - 10.days).uncertainty_in_skill_level.round(7).should == 4.1081014
+    Skillz::Player.new(25, 5, @now - 60.days).skill_uncertainty.round(7).should == 5.7462792
+  end
+
+  it "does not adjust if inactive for less than 25 days" do
+    Skillz::Player.new(25, 5, @now - 25.days).skill_uncertainty.round(7).should == 5
+    Skillz::Player.new(25, 5, @now - 26.days).skill_uncertainty.round(7).should == 5.343775
+  end
+
+   it "time decay assumes 4 for sigma lower than 4" do
+    smaller = Skillz::Player.new(25, 2, @now - 60.days).skill_uncertainty.round(7) - 2
+    larger = Skillz::Player.new(25, 4, @now - 60.days).skill_uncertainty.round(7) - 4
+    smaller.round(7).should == larger.round(7)
+  end
+
+  it "time decay assumes 10 for sigma larger than 10" do
+    smaller = Skillz::Player.new(25, 11, @now - 60.days).skill_uncertainty.round(7) - 11
+    larger = Skillz::Player.new(25, 10, @now - 60.days).skill_uncertainty.round(7) - 10
+    smaller.should == larger
+    smaller = Skillz::Player.new(25, 13, @now - 13.days).skill_uncertainty.round(7) - 13
+    larger = Skillz::Player.new(25, 10, @now - 13.days).skill_uncertainty.round(7) - 10
+    smaller.should == larger
+  end
+
+  it "sets a temporary_id" do
+    one = Skillz::Player.new(25, 11).temporary_id.should be_present
+    two = Skillz::Player.new(25, 10, nil, 5).temporary_id.should == 5
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skillz
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - frausto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport