icu_ratings 0.3.1 → 1.0.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 1
+:patch: 0
 :build: 
-:major: 0
-:minor: 3
+:major: 1
+:minor: 0

data/lib/icu_ratings/player.rb

@@ -129,7 +129,24 @@ if it's used at all, is expected to be for player names in the form of String va
 
 After the <em>rate!</em> method has been called on the ICU::RatedTournament object, the results
 of the rating calculations are available via various methods of the player objects:
-_new_rating_, _rating_change_, _performance_, _expected_score_.
+
+_new_rating_::     This is the player's new rating. For rated players it is their old rating
+                   plus their _rating_change_. For provisional players it is their performance
+                   rating including their previous games. For unrated players it is their
+                   tournament performance rating. New rarings are not calculated for foreign
+                   players so this method just returned their start _rating_.
+_rating_change_::  This is the difference between the old and new ratings for rated players,
+                   based on sum of expected scores in each games and the player's K-factor.
+                   Zero for all other types of players.
+_performance_::    This returns the tournament rating performance for rated, unrated and
+                   foreign players. For provisional players it returns a weighted average
+                   of the player's tournament performance and their previous games. For
+                   provisional and unrated players it is the same as _new_rating_.
+_expected_score_:: This returns the sum of expected scores over all results for all player types.
+                   For rated players, this number times the K-factor gives their rating change.
+                   It is calculated for provisional, unrated and foreign players but not actually
+                   used to estimate new ratings (for provisional and unrated players performance
+                   estimates are used instead).
 
 == Unrateable Players
 
@@ -142,14 +159,11 @@ method.
 
   class RatedPlayer
     attr_reader :num, :rating, :kfactor, :games
-    attr_accessor :desc
+    attr_accessor :desc, :bonus
 
-    # After the tournament has been rated, this is the player's new rating. For rated players this is the old rating
-    # plus the _rating_change_. For provisional players it is their performance rating, including their previous
-    # games. For unrated players it is their tournament performance rating. For foreign players it is the same
-    # as their start _rating_.
+    # After the tournament has been rated, this is the player's new rating.
     def new_rating
-      full_rating? ? rating + rating_change : performance
+      full_rating? ? @rating + rating_change + @bonus : performance
     end
 
     # After the tournament has been rated, this is the difference between the old and new ratings for
@@ -160,16 +174,12 @@ method.
     end
 
     # After the tournament has been rated, this returns the sum of expected scores over all results.
-    # Although this is calculated for provisional and unrated players it is not used to estimate their
-    # new ratings. For rated players, this number times the K-factor gives the change in rating.
     def expected_score
       @results.inject(0.0) { |e, r| e + (r.expected_score || 0.0) }
     end
 
     # After the tournament has been rated, this returns the tournament rating performance for
-    # rated, unrated and foreign players. For provisional players it returns a weighted average
-    # of the player's tournament performance and their previous games. For provisional and
-    # unrated players it is the same as _new_rating_.
+    # rated, unrated and foreign players. Returns zero for rated players.
     def performance
       @performance
     end
@@ -189,6 +199,14 @@ method.
       @type
     end
 
+    def full_rating? # :nodoc:
+      @type == :rated || @type == :foreign
+    end
+
+    def bonus_rating # :nodoc:
+      @bonus_rating || @rating
+    end
+
     # Calculate a K-factor according to ICU rules.
     def self.kfactor(args)
       %w{rating start dob joined}.each { |a| raise "missing #{a} for K-factor calculation" unless args[a.to_sym] }
@@ -219,17 +237,15 @@ method.
       @results.sort!{ |a,b| a.round <=> b.round }
     end
 
-    def rate! # :nodoc:
-      @results.each { |r| r.rate!(self) }
-    end
-
-    def full_rating? # :nodoc:
-      @type == :rated || @type == :foreign
-    end
-
-    def init_performance # :nodoc:
+    def init # :nodoc:
       @performance = nil
       @estimated_performance = nil
+      @bonus_rating = nil
+      @bonus = 0
+    end
+
+    def rate! # :nodoc:
+      @results.each { |r| r.rate!(self) }
     end
 
     def estimate_performance # :nodoc:
@@ -237,7 +253,7 @@ method.
         opponent = result.opponent
         if opponent.full_rating? || opponent.performance
           sum[0]+= 1
-          sum[1]+= (opponent.full_rating? ? opponent.rating : opponent.performance) + (2 * result.score - 1) * 400.0
+          sum[1]+= (opponent.full_rating? ? opponent.bonus_rating : opponent.performance) + (2 * result.score - 1) * 400.0
         end
         sum
       end
@@ -249,14 +265,33 @@ method.
 
     def update_performance # :nodoc:
       stable = case
-      when  @performance &&  @estimated_performance then (@performance - @estimated_performance).abs < 0.5
-      when !@performance && !@estimated_performance then true
-      else false
+      when  @performance &&  @estimated_performance then
+        (@performance - @estimated_performance).abs < 0.5
+      when !@performance && !@estimated_performance then
+        true
+      else
+        false
       end
       @performance = @estimated_performance if @estimated_performance
       stable
     end
 
+    def calculate_bonus # :nodoc:
+      # Rounding is performed in places to emulate the older MSAccess implementation.
+      return if @type != :rated || @kfactor <= 24 || @results.size <= 4 || @rating >= 2100
+      change = rating_change
+      return if change <= 35 || @rating + change >= 2100
+      threshold = 32 + 3 * (@results.size - 4)
+      bonus = (change - threshold).round
+      return if bonus <= 0
+      bonus = (1.25 * bonus).round if kfactor >= 40
+      [2100, @performance].each { |max| bonus = max - @rating if bonus + @rating > max }
+      return if bonus <= 0
+      bonus = bonus.round
+      @bonus_rating = @rating + change + bonus
+      @bonus = bonus
+    end
+
     def ==(other) # :nodoc:
       return false unless other.is_a? ICU::RatedPlayer
       num == other.num
@@ -269,6 +304,7 @@ method.
       [:rating, :kfactor, :games, :desc].each { |atr| self.send("#{atr}=", opt[atr]) unless opt[atr].nil? }
       @results = []
       @type = deduce_type
+      @bonus = 0
     end
 
     def num=(num)

data/lib/icu_ratings/result.rb

@@ -125,9 +125,9 @@ _expected_score_, _rating_change_.
     end
 
     def rate!(player) # :nodoc:
-      player_rating   = player.full_rating?   ? player.rating   : player.performance
-      opponent_rating = opponent.full_rating? ? opponent.rating : opponent.performance
-      if (player_rating && opponent_rating)
+      player_rating   = player.full_rating?   ? player.rating         : player.performance
+      opponent_rating = opponent.full_rating? ? opponent.bonus_rating : opponent.performance
+      if player_rating && opponent_rating
         @expected_score = 1 / (1 + 10 ** ((opponent_rating - player_rating) / 400.0))
         @rating_change  = (@score - @expected_score) * player.kfactor if player.type == :rated
       end

data/lib/icu_ratings/tournament.rb

@@ -6,17 +6,19 @@ module ICU
 
 == Creating Tournaments
 
-ICU::RatedTournament object are created directly.
+ICU::RatedTournament objects are created directly.
 
   t = ICU::RatedTournament.new
 
-They have two optional parameters. One is called _desc_ (short for description) the value of which can be
-any object but will, if utilized, typically be the name of the tournament as a string.
+They have some optional parameters which can be set via the constructor or by calling
+the same-named setter methods. One is called _desc_ (short for description) the value
+of which can be any object but will, if utilized, typically be the name of the
+tournament as a string.
 
   t = ICU::RatedTournament.new(:desc => "Irish Championships 2010")
   puts t.desc                         # "Irish Championships 2010"
 
-The other optional parameter is _start_ for the start date. A Date object or a string that can be
+Another optional parameter is _start_ for the start date. A Date object or a string that can be
 parsed as a string can be used to set it. The European convention is preferred for dates like
 "03/06/2013" (3rd of June, not 6th of March). Attempting to set an invalid date will raise an
 exception.
@@ -25,6 +27,15 @@ exception.
   puts t.start.class                  # Date
   puts t.start.to_s                   # "2010-07-01"
 
+Also, there is the option _no_bonuses_. Bonuses are a feature of the ICU rating system. If you are
+rating a non-ICU tournament (such as a FIDE tournament) where bonues are not awarded use this option.
+
+  t = ICU::RatedTournament.new(:desc => 'Linares', :start => "07/02/2009", :no_bonuses => true)
+
+Note, however, that the ICU system also has its own unique way of treating provisional, unrated and
+foreign players, so the only FIDE tournaments that can be rated using this software are those that
+consist solely of rated players.
+
 == Rating Tournaments
 
 To rate a tournament, first add the players (see ICU::RatedPlayer for details):
@@ -54,8 +65,8 @@ Some of the above methods have the potential to raise RuntimeError exceptions.
 In the case of _add_player_ and _add_result_, the use of invalid arguments
 would cause such an error. Theoretically, the <em>rate!</em> method could also throw an
 exception if the iterative algorithm it uses to estimate performance ratings
-of unrated players failed to converge. However, practical experience has shown that
-this is highly unlikely.
+of unrated players failed to converge. However an instance of non-convergence
+has yet to be observed in practice.
 
 Since exception throwing is how errors are signalled, you should arrange for them
 to be caught and handled in some suitable place in your code.
@@ -64,7 +75,7 @@ to be caught and handled in some suitable place in your code.
 
   class RatedTournament
     attr_accessor :desc
-    attr_reader :start
+    attr_reader :start, :no_bonuses
 
     # Add a new player to the tournament. Returns the instance of ICU::RatedPlayer created.
     # See ICU::RatedPlayer for details.
@@ -91,8 +102,14 @@ to be caught and handled in some suitable place in your code.
 
     # Rate the tournament. Called after all players and results have been added.
     def rate!
-      performance_ratings
+      players.each { |p| p.init }
+      performance_ratings(30)
       players.each { |p| p.rate! }
+      if !no_bonuses && calculate_bonuses > 0
+        players.each { |p| p.rate! }
+        performance_ratings(1)
+        calculate_bonuses
+      end
     end
 
     # Return an array of all players, in order of player number.
@@ -110,23 +127,33 @@ to be caught and handled in some suitable place in your code.
       @start = ICU::Util.parsedate!(date)
     end
 
+    # Set whether there are no bonuses (false by default)
+    def no_bonuses=(no_bonuses)
+      @no_bonuses = no_bonuses ? true : false
+    end
+
     private
 
     # Create a new, empty (no players, no results) tournament.
     def initialize(opt={})
-      [:desc, :start].each { |atr| self.send("#{atr}=", opt[atr]) unless opt[atr].nil? }
+      [:desc, :start, :no_bonuses].each { |atr| self.send("#{atr}=", opt[atr]) unless opt[atr].nil? }
       @player = Hash.new
     end
 
-    def performance_ratings
-      @player.values.each { |p| p.init_performance }
+    # Calculate performance ratings either iteratively or with just one sweep for bonus calculations.
+    def performance_ratings(max)
       stable, count = false, 0
-      while !stable && count < 30
+      while !stable && count < max
         @player.values.each { |p| p.estimate_performance }
         stable = @player.values.inject(true) { |ok, p| p.update_performance && ok }
         count+= 1
       end
-      raise "performance rating estimation did not converge" unless stable
+      raise "performance rating estimation did not converge" if max > 1 && !stable
+    end
+
+    # Calculate bonuses for all players and return the number who got one.
+    def calculate_bonuses
+      @player.values.inject(0) { |t,p| t + (p.calculate_bonus ? 1 : 0) }
     end
   end
 end

data/spec/tournament_spec.rb

@@ -614,6 +614,259 @@ module ICU
       end
     end
 
+    context "#rate - a tournament with only rated players that included one player who received a bonus" do
+      # 1   Howley, Kieran  3509    4      2:W   3:W   4:L   5:W   6:W
+      # 2   O'Brien, Pat    12057   3      1:L   3:L   4:W   5:W   6:W
+      # 3   Eyers, Michael  6861    2.5    1:L   2:W   4:L   5:W   6:D
+      # 4   Guinan, Sean    12161   2.5    1:W   2:L   3:W   5:L   6:D
+      # 5   Cooke, Frank    10771   1.5    1:L   2:L   3:L   4:W   6:D
+      # 6   Benson, Nicola  6916    1.5    1:L   2:L   3:D   4:D   5:D
+      before(:all) do
+        @t = ICU::RatedTournament.new(:desc => "Drogheda Club Championship, 2009, Section G")
+        @t.add_player(1, :desc => 'Howley, Kieran', :rating => 1046, :kfactor => 24)
+        @t.add_player(2, :desc => "O'Brien, Pat",   :rating =>  953, :kfactor => 24)
+        @t.add_player(3, :desc => 'Eyers, Michael', :rating =>  922, :kfactor => 32)
+        @t.add_player(4, :desc => 'Guinan, Sean',   :rating =>  760, :kfactor => 40)
+        @t.add_player(5, :desc => 'Cooke, Frank',   :rating =>  825, :kfactor => 32)
+        @t.add_player(6, :desc => 'Benson, Nicola', :rating => 1002, :kfactor => 32)
+
+        @t.add_result(1, 1, 6, 'W')
+        @t.add_result(1, 2, 5, 'W')
+        @t.add_result(1, 3, 4, 'L')
+        @t.add_result(2, 6, 4, 'D')
+        @t.add_result(2, 5, 3, 'L')
+        @t.add_result(2, 1, 2, 'W')
+        @t.add_result(3, 2, 6, 'W')
+        @t.add_result(3, 3, 1, 'L')
+        @t.add_result(3, 4, 5, 'L')
+        @t.add_result(4, 6, 5, 'D')
+        @t.add_result(4, 1, 4, 'L')
+        @t.add_result(4, 2, 3, 'L')
+        @t.add_result(5, 3, 6, 'D')
+        @t.add_result(5, 4, 2, 'L')
+        @t.add_result(5, 5, 1, 'L')
+
+        @t.rate!
+      end
+
+      it "should agree with ICU rating database" do
+        [
+          [1, 4.0, 3.43, 1060,  0], # Howley
+          [2, 3.0, 2.70,  960,  0], # O'Brien
+          [3, 2.5, 2.44,  924,  0], # Eyers
+          [4, 2.5, 1.30,  824, 16], # Guinan
+          [5, 1.5, 1.67,  819,  0], # Cooke
+          [6, 1.5, 3.09,  951,  0], # Benson
+        ].each do |item|
+          num, score, expected_score, new_rating, bonus = item
+          p = @t.player(num)
+          p.score.should == score
+          p.expected_score.should be_close(expected_score, 0.01)
+          p.new_rating.should be_close(new_rating, 0.5)
+          p.bonus.should == bonus
+        end
+      end
+    end
+
+    context "#rate - a tournament with one rated player who got a bonus and the rest foreigners" do
+      # 1   Magee, Ronan          10470   6      8:L   0:+   3:W   0:+   5:L   7:W   6:W   4:W   2:L
+      # 2   Antal Tibor, Kende    17014   1      0:    0:    0:    0:    0:    0:    0:    0:    1:W
+      # 3   Arsic, Djordje        17015   0      0:    0:    1:L   0:    0:    0:    0:    0:    0:
+      # 4   Donchenko, Alexander  17016   0      0:    0:    0:    0:    0:    0:    0:    1:L   0:
+      # 5   Emdin, Mark           17017   1      0:    0:    0:    0:    1:W   0:    0:    0:    0:
+      # 6   Lushnikov, Evgeny     17018   0      0:    0:    0:    0:    0:    0:    1:L   0:    0:
+      # 7   Pulpan, Jakub         17019   0      0:    0:    0:    0:    0:    1:L   0:    0:    0:
+      # 8   Toma, Radu-Cristian   17020   1      1:W   0:    0:    0:    0:    0:    0:    0:    0:
+      before(:all) do
+        @t = ICU::RatedTournament.new(:desc => "European Youth Chess Championships, 2008")
+        @t.add_player(1, :desc => 'Magee, Ronan',         :rating => 1667, :kfactor => 40)
+        @t.add_player(2, :desc => "Antal Tibor, Kende",   :rating => 2036)
+        @t.add_player(3, :desc => 'Arsic, Djordje',       :rating => 1790)
+        @t.add_player(4, :desc => 'Donchenko, Alexander', :rating => 1832)
+        @t.add_player(5, :desc => 'Emdin, Mark',          :rating => 1832)
+        @t.add_player(6, :desc => 'Lushnikov, Evgeny',    :rating => 1939)
+        @t.add_player(7, :desc => 'Pulpan, Jakub',        :rating => 1955)
+        @t.add_player(8, :desc => 'Toma, Radu-Cristian',  :rating => 1893)
+
+        @t.add_result(1, 1, 8, 'L')
+        @t.add_result(3, 1, 3, 'W')
+        @t.add_result(5, 1, 5, 'L')
+        @t.add_result(6, 1, 7, 'W')
+        @t.add_result(7, 1, 6, 'W')
+        @t.add_result(8, 1, 4, 'W')
+        @t.add_result(9, 1, 2, 'L')
+
+        @t.rate!
+      end
+
+      it "should agree with ICU rating database except for new ratings of foreigners" do
+        [
+          [1, 4.0, 1.54, 1954], # Magee
+          [2, 1.0, 0.76, 2236], # Antal
+          [3, 0.0, 0.43, 1436], # Arsic
+          [4, 0.0, 0.49, 1436], # Donchenko
+          [5, 1.0, 0.49, 2236], # Emdin
+          [6, 0.0, 0.64, 1436], # Lushnikov
+          [7, 0.0, 0.66, 1436], # Pulpan
+          [8, 1.0, 0.58, 2236], # Toma
+        ].each do |item|
+          num, score, expected_score, performance = item
+          p = @t.player(num)
+          p.score.should == score
+          p.expected_score.should be_close(expected_score, 0.01)
+          p.performance.should be_close(performance, 0.5)
+          if num == 1
+            p.new_rating.should be_close(1836, 0.5)
+            p.bonus.should == 71
+          else
+            p.new_rating.should == p.rating
+          end
+        end
+      end
+    end
+
+    context "#rate - a tournament with a one provisional and one player who got a bonus" do
+      # 1   Blake, Austin           3403    3.5    6:D   2:D   3:W   4:W   5:D
+      # 2   Fitzpatrick, Kevin      6968    4      5:W   1:D   6:D   3:W   4:W
+      # 3   George Rajesh, Nikhil   10411   1      4:W   5:L   1:L   2:L   6:L
+      # 4   Mullooly, Sean          6721    0      3:L   6:L   5:L   1:L   2:L
+      # 5   Mullooly, Michael       6623    3.5    2:L   3:W   4:W   6:W   1:D
+      # 6   O'Dwyer, Eoin           5931    3      1:D   4:W   2:D   5:L   3:W
+      before(:all) do
+        @t = ICU::RatedTournament.new(:desc => "Drogheda Congress Sec 5 2007")
+        @t.add_player(1, :desc => 'Austin Blake (3403)',          :rating => 1081, :kfactor => 24)
+        @t.add_player(2, :desc => 'Kevin Fitzpatrick (6968)',     :rating => 1026, :kfactor => 32)
+        @t.add_player(3, :desc => 'Nikhil George Rajesh (10411)', :rating =>  603, :games   =>  5)
+        @t.add_player(4, :desc => 'Sean Mullooly (6721)',         :rating =>  568, :kfactor => 40)
+        @t.add_player(5, :desc => 'Michael Mullooly (6623)',      :rating =>  719, :kfactor => 40)
+        @t.add_player(6, :desc => "Eoin O'Dwyer (5931)",          :rating => 1032, :kfactor => 40)
+
+        @t.add_result(1, 1, 6, 'D')
+        @t.add_result(1, 2, 5, 'W')
+        @t.add_result(1, 3, 4, 'W')
+        @t.add_result(2, 6, 4, 'W')
+        @t.add_result(2, 5, 3, 'W')
+        @t.add_result(2, 1, 2, 'D')
+        @t.add_result(3, 6, 2, 'D')
+        @t.add_result(3, 3, 1, 'L')
+        @t.add_result(3, 4, 5, 'L')
+        @t.add_result(4, 5, 6, 'W')
+        @t.add_result(4, 1, 4, 'W')
+        @t.add_result(4, 2, 3, 'W')
+        @t.add_result(5, 3, 6, 'L')
+        @t.add_result(5, 4, 2, 'L')
+        @t.add_result(5, 5, 1, 'D')
+
+        @t.rate!
+      end
+
+      it "should agree with ICU rating database" do
+        [
+          [1, 3.5, 3.84,  977, 1073,  0], # Austin
+          [2, 4.0, 3.51, 1068, 1042,  0], # Kevin
+          [3, 1.0, 1.05,  636,  636,  0], # Nikhil
+          [4, 0.0, 0.78,  520,  537,  0], # Sean
+          [5, 3.5, 1.74, 1026,  835, 45], # Michael
+          [6, 3.0, 3.54,  907, 1010,  0], # Eoin
+        ].each do |item|
+          num, score, expected_score, performance, new_rating, bonus = item
+          p = @t.player(num)
+          p.score.should == score
+          p.bonus.should == bonus
+          p.performance.should be_close(performance, 0.5)
+          p.expected_score.should be_close(expected_score, 0.01)
+          p.new_rating.should be_close(new_rating, 0.5)
+        end
+      end
+    end
+
+    context "#rate - a tournament with a mixture of player types that included 2 players who received bonuses" do
+      # 1   Fanjimni, Kayode Daniel 12221   4      2:L   3:W   4:-   5:W   6:W   7:W
+      # 2   Guinan, Cian            12160   3.5    1:W   3:D   4:W   5:-   6:L   7:W
+      # 3   Duffy, Sinead           12185   3.5    1:L   2:D   4:-   5:W   6:W   7:W
+      # 4   Cooke, Peter            12169   1      1:-   2:L   3:-   5:L   6:W   7:-
+      # 5   Callaghan, Tony         10728   1      1:L   2:-   3:L   4:W   6:-   7:-
+      # 6   Montenegro, May Yol     10901   1      1:L   2:W   3:L   4:L   5:-   7:-
+      # 7   Lowry-O'Reilly, Johanna 5535    0      1:L   2:L   3:L   4:-   5:-   6:-
+      before(:all) do
+        @t = ICU::RatedTournament.new(:desc => "Drogheda Club Championship, 2009, Section H")
+        @t.add_player(1, :desc => 'Fanjimni, Kayode Daniel', :rating => 1079, :games => 17)
+        @t.add_player(2, :desc => 'Guinan, Cian',            :rating =>  659, :kfactor => 40)
+        @t.add_player(3, :desc => 'Duffy, Sinead',           :rating =>  731, :kfactor => 40)
+        @t.add_player(4, :desc => 'Cooke, Peter',            :rating =>  728, :kfactor => 40)
+        @t.add_player(5, :desc => 'Callaghan, Tony',         :rating =>  894, :games => 5)
+        @t.add_player(6, :desc => 'Montenegro, May Yol')
+        @t.add_player(7, :desc => "Lowry-O'Reilly, Johanna", :rating =>  654, :kfactor => 24)
+
+        @t.add_result(1, 2, 7, 'W')
+        @t.add_result(1, 3, 6, 'W')
+        @t.add_result(1, 4, 5, 'L')
+        @t.add_result(2, 6, 4, 'L')
+        @t.add_result(2, 7, 3, 'L')
+        @t.add_result(2, 1, 2, 'L')
+        @t.add_result(3, 3, 1, 'L')
+        @t.add_result(4, 2, 3, 'D')
+        @t.add_result(5, 4, 2, 'L')
+        @t.add_result(5, 5, 1, 'L')
+        @t.add_result(6, 1, 6, 'W')
+        @t.add_result(7, 5, 3, 'L')
+        @t.add_result(7, 6, 2, 'W')
+        @t.add_result(7, 7, 1, 'L')
+
+        @t.rate!
+
+        @m = [
+          # MSAccess results taken from rerun of original which is different (reason unknown).
+          [1, 4.0, 4.28, 1052, 1052,  0], # Fanjini
+          [2, 3.5, 1.93,  920,  757, 35], # Guinan
+          [3, 3.5, 2.29,  932,  798, 18], # Duffy
+          [4, 1.0, 1.52,  588,  707,  0], # Cooke
+          [5, 1.0, 1.40,  828,  828,  0], # Callaghan
+          [6, 1.0, 0.91,  627,  627,  0], # Montenegro
+          [7, 0.0, 0.78,  460,  635,  0], # Lowry-O'Reilly
+        ]
+      end
+
+      it "should agree with ICU rating database" do
+        @m.each do |item|
+          num, score, expected_score, performance, new_rating, bonus = item
+          p = @t.player(num)
+          p.score.should == score
+          p.bonus.should == bonus
+          p.performance.should be_close(performance, num == 2 ? 0.6 : 0.5)
+          p.expected_score.should be_close(expected_score, 0.01)
+          p.new_rating.should be_close(new_rating, 0.5)
+        end
+      end
+
+      it "should give the same results if rated twice" do
+        @t.rate!
+        @m.each do |item|
+          num, score, expected_score, performance, new_rating, bonus = item
+          p = @t.player(num)
+          p.score.should == score
+          p.bonus.should == bonus
+          p.performance.should be_close(performance, num == 2 ? 0.6 : 0.5)
+          p.expected_score.should be_close(expected_score, 0.01)
+          p.new_rating.should be_close(new_rating, 0.5)
+        end
+      end
+
+      it "should be completely different if bonuses are turned off" do
+        @t.no_bonuses = true
+        @t.rate!
+        @m.each do |item|
+          num, score, expected_score, performance, new_rating, bonus = item
+          p = @t.player(num)
+          p.score.should == score
+          p.bonus.should == 0
+          p.performance.should_not be_close(performance, 1.0)
+          p.expected_score.should_not be_close(expected_score, 0.01)
+          p.new_rating.should_not be_close(new_rating, 1.0)
+        end
+      end
+    end
+
     context "#rate - a made-up tournament that includes a group of unrateable players" do
       #   1   Orr, Mark               1350    2      2:W   3:W   0:-
       #   2   Coughlan, Anne          251     1      1:L   0:-   3:W
@@ -646,7 +899,7 @@ module ICU
           [2,  0.91, 1184],
           [3,  0.10,  792],
         ].each do |item|
-          num, expected_score, new_rating, performance = item
+          num, expected_score, new_rating = item
           p = @t.player(num)
           p.expected_score.should be_close(expected_score, 0.01)
           p.new_rating.should be_close(new_rating, 0.5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: icu_ratings
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Mark Orr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +00:00
+date: 2010-02-14 00:00:00 +00:00
 default_executable: 
 dependencies: []