icu_ratings 1.4.0 → 1.5.0

data/README.rdoc

@@ -4,11 +4,11 @@ For calculating the Elo ratings of players in a chess tournament. The software i
 the Irish Chess Union's existing rating software written in Microsoft Visual Basic and
 intended to replace it in the near future.
 
-The rating calculations are identical to FIDE's for tournaments that consist entirely
-of established players (with the exception of player bonuses, which can be turned off).
+The rating calculations are the same as FIDE's for tournaments that consist entirely
+of established players with the exception of player bonuses (which can be turned off)
+and different rules for assigning K-factors.
 However, the ICU has it's own peculiar way of dealing with unrated players (players
-with only a provisional rating or without any prior rating) which is not the same as
-FIDE's.
+with only a provisional rating or without any prior rating) which is different to FIDE's.
 
 == Install
 
@@ -35,9 +35,9 @@ Then add results (see ICU::RatedResult for details):
   t.add_result(4, 2, 1, 'D')    # players 1 and 2 drew in round 4
   # ...
 
-Then call the <em>rate!</em> method.
+Then call the <em>rate!</em> method using the recommended version of the algorithm (see ICU::RatedTournament).
 
-  t.rate!
+  t.rate!(version: 2)
 
 If no exceptions have been raised yet, the tournament is now rated and the
 main results of the rating calculations can be extracted by querying the

data/lib/icu_ratings/player.rb

@@ -241,8 +241,9 @@ module ICU
       @bonus = 0
     end
 
-    def rate! # :nodoc:
+    def rate!(update_bonus=false) # :nodoc:
       @results.each { |r| r.rate!(self) }
+      @bonus_rating = @rating + @bonus + rating_change if update_bonus && @bonus_rating
     end
 
     def estimate_performance # :nodoc:
@@ -273,9 +274,7 @@ module ICU
       stable
     end
 
-    def calculate_bonus(allow_new_bonus) # :nodoc:
-      # New in December 2012 - see http://ratings.icu.ie/articles/18 (Part 2).
-      return if !allow_new_bonus && @bonus == 0
+    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

data/lib/icu_ratings/result.rb

@@ -85,25 +85,12 @@ module ICU
   #
   # == After the Tournament is Rated
   #
-  # The main rating calculations are avaiable from player methods (see ICU::RatedPlayer)
+  # The main rating calculations are available from player methods (see ICU::RatedPlayer)
   # but additional details are available via methods of each player's individual results:
   # _expected_score_, _rating_change_.
   #
   class RatedResult
-    # The round number.
-    def round
-      @round
-    end
-
-    # The player's opponent (an instance of ICU::RatedPlayer).
-    def opponent
-      @opponent
-    end
-
-    # The player's score in this game (1.0, 0.5 or 0.0).
-    def score
-      @score
-    end
+    attr_reader :round, :opponent, :score
 
     # After the tournament has been rated, this returns the expected score (between 0 and 1)
     # for the player based on the rating difference with the opponent scaled by 400.

data/lib/icu_ratings/tournament.rb

@@ -57,27 +57,20 @@ module ICU
   #
   # See ICU::RatedPlayer and ICU::RatedResult for more details.
   #
-  # The <em>rate!</em> method takes some optional arguments to control the algorithm, for example:
+  # The <em>rate!</em> method takes an optional <em>version</em> argument to control the precise algorithm, for example:
   #
-  #   t.rate!(max_iterations2: 30, phase_2_bonuses: false)    # these are the recommended options
+  #   t.rate!(version: 2)
   #
-  # The complete set of current options, with their defaults, is:
-  #
-  # * <em>max_iterations1</em>: the maximum number of re-estimation iterations before the bonus calculation (default <b>30</b>)
-  # * <em>max_iterations2</em>: the maximum number of re-estimation iterations after the bonus calculation (default <b>1</b>)
-  # * <em>threshold</em>: the maximum difference allowed between re-estimated ratings in a stabe solution (default <b>0.5</b>)
-  # * <em>phase_2_bonuses</em>: allow new bonuses in the second phase of calculation (default <b>true</b>)
-  #
-  # The defaults correspond to the original algorithm. However, it is recommended not to use the defaults for
-  # <em>max_iterations2</em> and <em>phase_2_bonuses</em> but to use <em>30</em> and <em>false</em> instead.
-  # See <a href="http://ratings.icu.ie/articles/18">this article</a> for more details.
+  # Without a version number or with version <em>0</em>, the original pre-2012 algorithm is used. However, some improvements
+  # have since been found (see http://ratings.icu.ie/articles/18 for more details) and currently
+  # the recommended version to use is <b>2</b>.
   #
   # == Error Handling
   #
   # 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
+  # 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 an instance of non-convergence
   # has yet to be observed in practice.
   #
@@ -113,17 +106,35 @@ module ICU
 
     # Rate the tournament. Called after all players and results have been added.
     def rate!(opt={})
-      max_iterations1 = opt[:max_iterations1] || 30
-      max_iterations2 = opt[:max_iterations2] || 1                                      # legacy default - see http://ratings.icu.ie/articles/18 (Part 1)
-      phase_2_bonuses = opt.has_key?(:phase_2_bonuses) ? opt[:phase_2_bonuses] : true   # legacy default - see http://ratings.icu.ie/articles/18 (Part 2)
-      threshold = opt[:threshold] || 0.5
+      # The original algorithm (version 0).
+      max_iterations  = [30, 1]
+      phase_2_bonuses = true
+      update_bonuses  = false
+      threshold       = 0.5
+
+      # New versions of the algorithm.
+      version = opt[:version].to_i
+      if version >= 1
+        # See http://ratings.icu.ie/articles/18 (Part 1)
+        max_iterations[1] = 30
+      end
+      if version >= 2
+        # See http://ratings.icu.ie/articles/18 (Part 2)
+        phase_2_bonuses = false
+        update_bonuses  = true
+        threshold       = 0.1
+      end
+
+      # Phase 1.
       players.each { |p| p.init }
-      @iterations1 = performance_ratings(max_iterations1, threshold)
+      @iterations1 = performance_ratings(max_iterations[0], threshold)
       players.each { |p| p.rate! }
+
+      # Phase 2.
       if !no_bonuses && calculate_bonuses > 0
-        players.each { |p| p.rate! }
-        @iterations2 = performance_ratings(max_iterations2, threshold)
-        calculate_bonuses(phase_2_bonuses)
+        players.each { |p| p.rate!(update_bonuses) }
+        @iterations2 = performance_ratings(max_iterations[1], threshold)
+        calculate_bonuses if phase_2_bonuses
       else
         @iterations2 = 0
       end
@@ -157,7 +168,7 @@ module ICU
       @player = Hash.new
     end
 
-    # Calculate performance ratings either iteratively or with just one sweep for bonus calculations.
+    # Calculate performance ratings either iteratively up to a maximum number.
     def performance_ratings(max, thresh)
       stable, count = false, 0
       while !stable && count < max
@@ -170,8 +181,8 @@ module ICU
     end
 
     # Calculate bonuses for all players and return the number who got one.
-    def calculate_bonuses(allow_new_bonus=true)
-      @player.values.inject(0) { |t,p| t + (p.calculate_bonus(allow_new_bonus) ? 1 : 0) }
+    def calculate_bonuses
+      @player.values.inject(0) { |t,p| t + (p.calculate_bonus ? 1 : 0) }
     end
   end
 end

data/lib/icu_ratings/version.rb

@@ -2,6 +2,6 @@
 
 module ICU
   class Ratings
-    VERSION = "1.4.0"
+    VERSION = "1.5.0"
   end
 end

data/spec/tournament_spec.rb

@@ -1218,7 +1218,7 @@ module ICU
         @t.iterations2.should be_nil
       end
 
-      it "should produce inconsistent results with default settings" do
+      it "should produce inconsistent results with original algorithm" do
         @t.rate!
 
         @p.new_rating.should be_within(0.5).of(763)  # the original calculation
@@ -1239,8 +1239,8 @@ module ICU
         @t.iterations2.should == 1
       end
 
-      it "should produce consistent results with more iterations after the bonus stage" do
-        @t.rate!(max_iterations2: 30)
+      it "should produce consistent results with version 1 algorithm" do
+        @t.rate!(version: 1)
 
         @p.new_rating.should_not be_within(0.5).of(763)  # the new calculation is different
 
@@ -1265,7 +1265,7 @@ module ICU
       before(:each) do
         @t = ICU::RatedTournament.new(desc: "Bunratty Minor 2012")
 
-        # Add the player's of most interest (Sasha-Ettore Faleschini and his opponents).
+        # Add the players of most interest (Sasha-Ettore Faleschini and his opponents).
         @p  = @t.add_player(1752, desc: "Sasha-Ettore Faleschini")
         @o1 = @t.add_player(1748, desc: "John P. Dunne",      rating:  946, kfactor: 40)
         @o2 = @t.add_player(1755, desc: "Jack Fitzgerald",    rating:  913, kfactor: 40)
@@ -1276,57 +1276,57 @@ module ICU
 
         # Add all the other players.
         @t.add_player(1730, desc: "Jeffrey Alfred",           rating: 1058, kfactor: 40)
-        @t.add_player(1731, desc: "Suliman Ali",              rating: 1166, rating:   17)
+        @t.add_player(1731, desc: "Suliman Ali",              rating: 1166, games:   17)
         @t.add_player(1733, desc: "Dylan Boland")
         @t.add_player(1734, desc: "Shane Briggs",             rating: 1079, kfactor: 24)
         @t.add_player(1735, desc: "Joe Browne",               rating:  919, kfactor: 24)
-        @t.add_player(1736, desc: "Kieran Burke",             rating:  765, rating:  10)
+        @t.add_player(1736, desc: "Kieran Burke",             rating:  765, games:   10)
         @t.add_player(1737, desc: "Liam Cadogan",             rating: 1002, kfactor: 24)
-        @t.add_player(1738, desc: "Evan Cahill",              rating:  494, rating:   4)
+        @t.add_player(1738, desc: "Evan Cahill",              rating:  494, games:    4)
         @t.add_player(1739, desc: "Joseph Cesar",             rating:  751, kfactor: 40)
-        @t.add_player(1740, desc: "Joshua Cesar",             rating:  403, rating:  10)
+        @t.add_player(1740, desc: "Joshua Cesar",             rating:  403, games:   10)
         @t.add_player(1741, desc: "John G. Connolly",         rating:  952, kfactor: 32)
         @t.add_player(1742, desc: "Fiona Cormican",           rating:  483, kfactor: 32)
-        @t.add_player(1743, desc: "Joe Cronin",               rating:  601, rating:   6)
-        @t.add_player(1744, desc: "Aaron Daly",               rating:  699, rating:  12)
+        @t.add_player(1743, desc: "Joe Cronin",               rating:  601, games:    6)
+        @t.add_player(1744, desc: "Aaron Daly",               rating:  699, games:   12)
         @t.add_player(1745, desc: "Conor Devilly",            rating:  676, kfactor: 40)
         @t.add_player(1746, desc: "Charles Dillon")
         @t.add_player(1747, desc: "Jack Donovan")
         @t.add_player(1749, desc: "Thomas Dunne",             rating:  887, kfactor: 32)
         @t.add_player(1750, desc: "Michael Eyers",            rating:  857, kfactor: 32)
-        @t.add_player(1751, desc: "Sean Fagan",               rating:  243, rating:  10)
-        @t.add_player(1753, desc: "Victoria Fennell",         rating:  166, rating:  11)
+        @t.add_player(1751, desc: "Sean Fagan",               rating:  243, games:   10)
+        @t.add_player(1753, desc: "Victoria Fennell",         rating:  166, games:   11)
         @t.add_player(1754, desc: "Mark Finn-Lynch")
-        @t.add_player(1756, desc: "Peter Fletcher",           rating:  680, rating:  18)
+        @t.add_player(1756, desc: "Peter Fletcher",           rating:  680, games:   18)
         @t.add_player(1757, desc: "Darragh Flynn",            rating:  296, kfactor: 40)
-        @t.add_player(1758, desc: "Geordan Freeman",          rating:  413, rating:   4)
+        @t.add_player(1758, desc: "Geordan Freeman",          rating:  413, games:    4)
         @t.add_player(1759, desc: "Ruairi Freeman",           rating:  582, kfactor: 40)
         @t.add_player(1760, desc: "Aoife Gallagher")
         @t.add_player(1761, desc: "Hannah Gallagher")
         @t.add_player(1762, desc: "Tommy Gallagher")
         @t.add_player(1763, desc: "Leslie Garabedian")
-        @t.add_player(1764, desc: "Alexander Gillett",        rating:  850, rating:  19)
-        @t.add_player(1765, desc: "Jan Glegolski",            rating:  525, rating:  16)
+        @t.add_player(1764, desc: "Alexander Gillett",        rating:  850, games:   19)
+        @t.add_player(1765, desc: "Jan Glegolski",            rating:  525, games:   16)
         @t.add_player(1767, desc: "Mark Halley",              rating: 1280, kfactor: 40)
-        @t.add_player(1768, desc: "Siobhan Halley",           rating:  434, rating:  18)
-        @t.add_player(1769, desc: "Luke Hayden",              rating:  781, rating:   6)
-        @t.add_player(1770, desc: "Colm Hehir",               rating:  564, rating:  16)
-        @t.add_player(1771, desc: "Donal Hehir",              rating:  424, rating:   6)
+        @t.add_player(1768, desc: "Siobhan Halley",           rating:  434, games:   18)
+        @t.add_player(1769, desc: "Luke Hayden",              rating:  781, games:    6)
+        @t.add_player(1770, desc: "Colm Hehir",               rating:  564, games:   16)
+        @t.add_player(1771, desc: "Donal Hehir",              rating:  424, games:    6)
         @t.add_player(1772, desc: "Andrew Ingram",            rating:  859, kfactor: 32)
         @t.add_player(1773, desc: "Rory Jackson")
         @t.add_player(1774, desc: "Tom Kearney",              rating:  924, kfactor: 40)
-        @t.add_player(1775, desc: "Jamie Kearns",             rating:  753, rating:  11)
+        @t.add_player(1775, desc: "Jamie Kearns",             rating:  753, games:   11)
         @t.add_player(1777, desc: "Thomas Keating",           rating:  864, kfactor: 40)
         @t.add_player(1778, desc: "Darragh Kennedy",          rating: 1052, kfactor: 40)
         @t.add_player(1779, desc: "Stephen Kennedy",          rating:  490, kfactor: 40)
         @t.add_player(1780, desc: "Jonathan Kiely",           rating: 1117, kfactor: 24)
         @t.add_player(1781, desc: "Kevin Kilduff",            rating: 1116, kfactor: 40)
-        @t.add_player(1782, desc: "Conor Kirby MacGuill",     rating:  410, rating:   9)
+        @t.add_player(1782, desc: "Conor Kirby MacGuill",     rating:  410, games:    9)
         @t.add_player(1783, desc: "Wiktor Kwapinski")
         @t.add_player(1784, desc: "Andrew Kyne-Delaney",      rating:  869, kfactor: 40)
         @t.add_player(1785, desc: "Samuel Lenihan",           rating:  683, kfactor: 40)
         @t.add_player(1786, desc: "Haoang Li",                rating:  667, kfactor: 40)
-        @t.add_player(1787, desc: "Stephen Li",               rating:  880, rating:  17)
+        @t.add_player(1787, desc: "Stephen Li",               rating:  880, games:   17)
         @t.add_player(1788, desc: "Desmond Martin",           rating: 1018, kfactor: 24)
         @t.add_player(1789, desc: "Clare McCarrick",          rating:  805, kfactor: 40)
         @t.add_player(1790, desc: "Padraig McCullough",       rating:  676, kfactor: 24)
@@ -1339,7 +1339,7 @@ module ICU
         @t.add_player(1797, desc: "Jacob Miller")
         @t.add_player(1799, desc: "Diarmuid Minnock",         rating:  760, kfactor: 40)
         @t.add_player(1800, desc: "Michael Morgan",           rating:  889, kfactor: 32)
-        @t.add_player(1801, desc: "Alex Mulligan",            rating:  603, rating:  17)
+        @t.add_player(1801, desc: "Alex Mulligan",            rating:  603, games:   17)
         @t.add_player(1802, desc: "Scott Mulligan",           rating: 1100, kfactor: 40)
         @t.add_player(1803, desc: "Jessica Mulqueen-Danaher", rating:  286, kfactor: 40)
         @t.add_player(1804, desc: "Christopher Murphy",       rating:  990, kfactor: 40)
@@ -1348,10 +1348,10 @@ module ICU
         @t.add_player(1807, desc: "Dan O'Brien",              rating:  789, kfactor: 40)
         @t.add_player(1808, desc: "Pat O'Brien",              rating:  970, kfactor: 24)
         @t.add_player(1809, desc: "Michael Joseph O'Connell", rating: 1010, kfactor: 32)
-        @t.add_player(1810, desc: "John P. O'Connor",         rating:  242, rating:   6)
+        @t.add_player(1810, desc: "John P. O'Connor",         rating:  242, games:    6)
         @t.add_player(1811, desc: "Ross O'Connor",            rating:  812, kfactor: 40)
         @t.add_player(1812, desc: "Colm O'Muireagain",        rating:  950, kfactor: 32)
-        @t.add_player(1813, desc: "Barry O'Reilly",           rating:  736, rating:   6)
+        @t.add_player(1813, desc: "Barry O'Reilly",           rating:  736, games:    6)
         @t.add_player(1814, desc: "Jim O'Reilly",             rating:  784, kfactor: 40)
         @t.add_player(1815, desc: "David Piercy",             rating:  970, kfactor: 32)
         @t.add_player(1816, desc: "Agnieszka Pozniak",        rating:  906, kfactor: 40)
@@ -1362,8 +1362,8 @@ module ICU
         @t.add_player(1821, desc: "Stephen Sheehan")
         @t.add_player(1822, desc: "Kevin Singpurwala",        rating:  790, kfactor: 40)
         @t.add_player(1823, desc: "Kaj Skubiszak")
-        @t.add_player(1824, desc: "Jack Staed",               rating:  133, rating:  10)
-        @t.add_player(1825, desc: "Devin Tarleton",           rating:  852, rating:  11)
+        @t.add_player(1824, desc: "Jack Staed",               rating:  133, games:   10)
+        @t.add_player(1825, desc: "Devin Tarleton",           rating:  852, games:   11)
         @t.add_player(1826, desc: "M. Thangaramanujam",       rating:  813, kfactor: 24)
         @t.add_player(1827, desc: "Haley Tomlinson")
         @t.add_player(1828, desc: "Peter Urwin",              rating:  848, kfactor: 40)
@@ -1998,7 +1998,7 @@ module ICU
         @t.iterations2.should be_nil
       end
 
-      it "should produce inconsistent results with default settings" do
+      it "should produce inconsistent results with original algorithm" do
         @t.rate!
 
         @p.new_rating.should == @p.performance
@@ -2019,8 +2019,8 @@ module ICU
         @t.iterations2.should == 1
       end
 
-      it "should produce inconsistent results even with more 2nd phase iterations" do
-        @t.rate!(max_iterations2: 30)
+      it "should produce inconsistent results with version 1 algorithm" do
+        @t.rate!(version: 1)
 
         @p.new_rating.should == @p.performance
 
@@ -2040,8 +2040,8 @@ module ICU
         @t.iterations2.should be > 1
       end
 
-      it "should produce consistent results only when new bonuses in phase 2 are disallowed" do
-        @t.rate!(max_iterations2: 30, phase_2_bonuses: false)
+      it "should produce consistent results with version 2 algorithm" do
+        @t.rate!(version: 2)
 
         @o1.bonus.should == 0  # no bonus this time because it comes from 2nd phase
         @o2.bonus.should == 0
@@ -2058,6 +2058,178 @@ module ICU
         @t.iterations1.should be > 1
         @t.iterations2.should be > 1
       end
+
+      it "should produce consistent results with version 3 algorithm" do
+        @t.rate!(version: 3)
+
+        @o1.bonus.should == 0  # no bonus this time because it comes from 2nd phase
+        @o2.bonus.should == 0
+        @o3.bonus.should == 0
+        @o4.bonus.should == 0
+        @o5.bonus.should == 0
+        @o6.bonus.should == 0
+
+        ratings = [@o1, @o2, @o3, @o4, @o5, @o6].map { |o| o.bonus == 0 ? o.rating : o.new_rating }
+
+        performance = ratings.inject(0.0){ |m,r| m = m + r } / 6.0 - 400.0 / 3.0
+        performance.should be_within(0.5).of(@p.new_rating)
+
+        @t.iterations1.should be > 1
+        @t.iterations2.should be > 1
+      end
+    end
+
+    context "#rate - Dierdre Turner in the Limerick U1400 2012" do
+      before(:each) do
+        @t = ICU::RatedTournament.new(desc: "Limerick U1400 2012")
+
+        # Add the players of most interest (Dierdre Turner and her opponents).
+        @p  = @t.add_player(6697, desc: "Dierdre Turner")
+        @o1 = @t.add_player(6678, desc: "John P. Dunne",      rating:  980, kfactor: 40)
+        @o2 = @t.add_player(6694, desc: "Jordan O'Sullivan")
+        @o3 = @t.add_player(6681, desc: "Ruairi Freeman",     rating:  537, kfactor: 40)
+        @o4 = @t.add_player(6676, desc: "Joe Cronin",         rating:  682, kfactor: 32)
+        @o5 = @t.add_player(6675, desc: "Jeffrey Alfred",     rating: 1320, kfactor: 40)
+        @o6 = @t.add_player(6687, desc: "Roisin MacNamee",    rating:  460, games:    7)
+
+        # Add all the other players.
+        @t.add_player(6679, desc: "Thomas Senior Dunne",      rating:  876, kfactor: 32)
+        @t.add_player(6682, desc: "John Hensey",              rating: 1347, kfactor: 24)
+        @t.add_player(6683, desc: "Noel Keating",             rating:  622, kfactor: 32)
+        @t.add_player(6684, desc: "Thomas Keating",           rating:  886, kfactor: 40)
+        @t.add_player(6686, desc: "Nora MacNamee",            rating:  508, kfactor: 40)
+        @t.add_player(6690, desc: "Robbie Meaney",            rating: 1020, kfactor: 40)
+        @t.add_player(6691, desc: "Stephen Meaney",           rating:  979, kfactor: 40)
+        @t.add_player(6692, desc: "Jessica Mulqueen-Danaher", rating:  435, kfactor: 40)
+        @t.add_player(6693, desc: "Michael Joseph O'Connell", rating:  965, kfactor: 32)
+        @t.add_player(6677, desc: "Adam Dean",                rating:  652, games:    6)
+        @t.add_player(6680, desc: "Geordan Freeman",          rating:  344, games:   10)
+        @t.add_player(6685, desc: "Eamon MacNamee")
+        @t.add_player(6688, desc: "Pippa Madigan")
+        @t.add_player(6689, desc: "John McNamara")
+        @t.add_player(6695, desc: "Grigory Ramendik")
+        @t.add_player(6696, desc: "Mark David Tonita")
+        @t.add_player(6698, desc: "Eoghan Turner")
+
+        # Dierdre's results.
+        @t.add_result(1, 6697, 6678, "L")
+        @t.add_result(2, 6697, 6694, "W")
+        @t.add_result(3, 6697, 6681, "W")
+        @t.add_result(4, 6697, 6676, "L")
+        @t.add_result(5, 6697, 6675, "L")
+        @t.add_result(6, 6697, 6687, "W")
+
+        # Other results.
+        @t.add_result(1, 6689, 6676, "L")
+        @t.add_result(1, 6693, 6677, "L")
+        @t.add_result(1, 6695, 6679, "L")
+        @t.add_result(1, 6694, 6681, "L")
+        @t.add_result(1, 6692, 6682, "L")
+        @t.add_result(1, 6688, 6683, "L")
+        @t.add_result(1, 6698, 6684, "D")
+        @t.add_result(1, 6691, 6685, "W")
+        @t.add_result(1, 6696, 6686, "L")
+        @t.add_result(1, 6690, 6687, "W")
+        @t.add_result(2, 6684, 6675, "D")
+        @t.add_result(2, 6682, 6676, "W")
+        @t.add_result(2, 6698, 6677, "L")
+        @t.add_result(2, 6683, 6678, "L")
+        @t.add_result(2, 6686, 6679, "L")
+        @t.add_result(2, 6690, 6680, "W")
+        @t.add_result(2, 6691, 6681, "W")
+        @t.add_result(2, 6693, 6685, "W")
+        @t.add_result(2, 6695, 6687, "L")
+        @t.add_result(2, 6692, 6689, "W")
+        @t.add_result(3, 6678, 6675, "W")
+        @t.add_result(3, 6687, 6676, "L")
+        @t.add_result(3, 6682, 6677, "W")
+        @t.add_result(3, 6696, 6680, "D")
+        @t.add_result(3, 6686, 6683, "L")
+        @t.add_result(3, 6693, 6684, "D")
+        @t.add_result(3, 6698, 6685, "W")
+        @t.add_result(3, 6692, 6688, "W")
+        @t.add_result(3, 6695, 6689, "L")
+        @t.add_result(3, 6691, 6690, "W")
+        @t.add_result(4, 6687, 6675, "L")
+        @t.add_result(4, 6683, 6677, "W")
+        @t.add_result(4, 6682, 6678, "D")
+        @t.add_result(4, 6691, 6679, "W")
+        @t.add_result(4, 6684, 6680, "W")
+        @t.add_result(4, 6693, 6681, "L")
+        @t.add_result(4, 6695, 6685, "W")
+        @t.add_result(4, 6694, 6686, "L")
+        @t.add_result(4, 6692, 6690, "L")
+        @t.add_result(4, 6698, 6696, "W")
+        @t.add_result(5, 6683, 6676, "W")
+        @t.add_result(5, 6692, 6677, "L")
+        @t.add_result(5, 6691, 6678, "W")
+        @t.add_result(5, 6698, 6679, "D")
+        @t.add_result(5, 6687, 6680, "W")
+        @t.add_result(5, 6689, 6681, "L")
+        @t.add_result(5, 6690, 6682, "L")
+        @t.add_result(5, 6686, 6684, "L")
+        @t.add_result(5, 6696, 6693, "L")
+        @t.add_result(5, 6695, 6694, "D")
+        @t.add_result(6, 6677, 6675, "D")
+        @t.add_result(6, 6698, 6676, "W")
+        @t.add_result(6, 6679, 6678, "L")
+        @t.add_result(6, 6694, 6680, "L")
+        @t.add_result(6, 6690, 6681, "W")
+        @t.add_result(6, 6691, 6682, "L")
+        @t.add_result(6, 6684, 6683, "L")
+        @t.add_result(6, 6696, 6685, "W")
+        @t.add_result(6, 6689, 6686, "L")
+        @t.add_result(6, 6693, 6692, "W")
+      end
+
+      it "should be setup properly" do
+        @p.desc.should  == "Dierdre Turner"
+        @o1.desc.should == "John P. Dunne"
+        @o2.desc.should == "Jordan O'Sullivan"
+        @o3.desc.should == "Ruairi Freeman"
+        @o4.desc.should == "Joe Cronin"
+        @o5.desc.should == "Jeffrey Alfred"
+        @o6.desc.should == "Roisin MacNamee"
+
+        @p.type.should  == :unrated
+        @o1.type.should == :rated
+        @o2.type.should == :unrated
+        @o3.type.should == :rated
+        @o4.type.should == :rated
+        @o5.type.should == :rated
+        @o6.type.should == :provisional
+
+        @o1.rating.should == 980
+        @o2.rating.should be_nil
+        @o3.rating.should == 537
+        @o4.rating.should == 682
+        @o5.rating.should == 1320
+        @o6.rating.should == 460
+
+        @t.iterations1.should be_nil
+        @t.iterations2.should be_nil
+      end
+
+      it "should produce consistent results with version 2 algorithm" do
+        @t.rate!(version: 2)
+
+        @p.new_rating.should == @p.performance
+
+        @o1.bonus.should == 23
+        @o2.bonus.should == 0
+        @o3.bonus.should == 0
+        @o4.bonus.should == 0
+        @o5.bonus.should == 0
+        @o6.bonus.should == 0
+
+        ratings = [@o1, @o2, @o3, @o4, @o5, @o6].map { |o| o.bonus > 0 || o.type != :rated ? o.new_rating : o.rating }
+
+        performance = ratings.inject(0.0){ |m,r| m = m + r } / 6.0
+        performance.should be_within(0.5).of(@p.new_rating)
+
+        @t.iterations1.should be > 1
+        @t.iterations2.should be > 1
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: icu_ratings
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4520836644444600714
+      hash: -4449600080095585228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4520836644444600714
+      hash: -4449600080095585228
 requirements: []
 rubyforge_project: icu_ratings
 rubygems_version: 1.8.23