icu_tournament 1.0.5 → 1.0.6

data/lib/icu_tournament/tournament.rb

@@ -101,6 +101,8 @@ The full list of supported methods is:
 * _Harkness_ (or _median_): like Buchholz except the highest and lowest opponents' scores are discarded (or two highest and lowest if 9 rounds or more)
 * _modified_median_: same as Harkness except only lowest (or highest) score(s) are discarded for players with more (or less) than 50%
 * _Neustadtl_ (or _Sonneborn-Berger_): sum of scores of players defeated plus half sum of scores of players drawn against
+* _progressive_ (or _cumulative_): sum of running score for each round
+* _ratings_: sum of opponents ratings
 * _blacks_: number of blacks
 * _wins_: number of wins
 * _name_: alphabetical by name (if _tie_breaks_ is set to an empty array, as it is initially, then this will be used as the back-up tie breaker)
@@ -215,12 +217,13 @@ The return value from _renumber_ is the tournament object itself.
           when 'sonneborn_berger'  then 'neustadtl'
           when 'modified_median'   then 'modified'
           when 'median'            then 'harkness'
+          when 'cumulative'        then 'progressive'
           else m
         end
       end
 
       # Check they're all valid.
-      tie_breaks.each { |m| raise "invalid tie break method '#{m}'" unless m.to_s.match(/^(blacks|buchholz|harkness|modified|name|neustadtl|wins)$/) }
+      tie_breaks.each { |m| raise "invalid tie break method '#{m}'" unless m.to_s.match(/^(blacks|buchholz|harkness|modified|name|neustadtl|progressive|ratings|wins)$/) }
 
       # Finally set them.
       @tie_breaks = tie_breaks;
@@ -469,27 +472,25 @@ The return value from _renumber_ is the tournament object itself.
       # Add the configured methods.
       tie_breaks.each do |m|
         methods << m
-        order[m] = -1
+        order[m] = m == 'name' ? 1 : -1
       end
 
       # Name is included as the last and least important tie breaker unless it's already been added.
       unless methods.include?('name')
         methods << 'name'
-        order['name'] = +1
+        order['name'] = 1
       end
 
       # We'll need the number of rounds.
       rounds = last_round
 
-      # Pre-calculate some scores that are not in themselves tie break score
+      # Pre-calculate some scores that are not in themselves tie break scores
       # but are needed in the calculation of some of the actual tie-break scores.
       pre_calculated = Array.new
       pre_calculated << 'opp-score'  # sum scores where a non-played games counts 0.5
       pre_calculated.each do |m|
         data[m] = Hash.new
-        @player.values.each do |p|
-          data[m][p.num] = tie_break_score(data, m, p, rounds)
-        end
+        @player.values.each { |p| data[m][p.num] = tie_break_score(data, m, p, rounds) }
       end
 
       # Now calculate all the other scores.
@@ -506,12 +507,14 @@ The return value from _renumber_ is the tournament object itself.
     # Return a tie break score for a given player and a given tie break method.
     def tie_break_score(hash, method, player, rounds)
       case method
-        when 'score'     then player.points
-        when 'wins'      then player.results.inject(0)   { |t,r| t + (r.opponent && r.score  == 'W' ? 1 : 0) }
-        when 'blacks'    then player.results.inject(0)   { |t,r| t + (r.opponent && r.colour == 'B' ? 1 : 0) }
-        when 'buchholz'  then player.results.inject(0.0) { |t,r| t + (r.opponent ? hash['opp-score'][r.opponent] : 0.0) }
-        when 'neustadtl' then player.results.inject(0.0) { |t,r| t + (r.opponent ? hash['opp-score'][r.opponent] * r.points : 0.0) }
-        when 'opp-score' then player.results.inject(0.0) { |t,r| t + (r.opponent ? r.points : 0.5) } + (rounds - player.results.size) * 0.5
+        when 'score'       then player.points
+        when 'wins'        then player.results.inject(0)   { |t,r| t + (r.opponent && r.score  == 'W' ? 1 : 0) }
+        when 'blacks'      then player.results.inject(0)   { |t,r| t + (r.opponent && r.colour == 'B' ? 1 : 0) }
+        when 'buchholz'    then player.results.inject(0.0) { |t,r| t + (r.opponent ? hash['opp-score'][r.opponent] : 0.0) }
+        when 'neustadtl'   then player.results.inject(0.0) { |t,r| t + (r.opponent ? hash['opp-score'][r.opponent] * r.points : 0.0) }
+        when 'opp-score'   then player.results.inject(0.0) { |t,r| t + (r.opponent ? r.points : 0.5) } + (rounds - player.results.size) * 0.5
+        when 'progressive' then (1..rounds).inject(0.0)    { |t,n| r = player.find_result(n); s = r ? r.points : 0.0; t + s * (rounds + 1 - n) }
+        when 'ratings'     then player.results.inject(0)   { |t,r| t + (r.opponent && @player[r.opponent].rating ? @player[r.opponent].rating : 0) }
         when 'harkness', 'modified'
           scores = player.results.map{ |r| r.opponent ? hash['opp-score'][r.opponent] : 0.0 }.sort
           1.upto(rounds - player.results.size) { scores << 0.0 }

data/lib/icu_tournament/tournament_sp.rb

@@ -39,7 +39,7 @@ ratings or IDs are required instead, use the options _id_ and _rating_. For exam
   tournament = parser.parse_file('ncc', "2010-05-08")
   tournament.player(2).id         # =>  12379 (ICU ID)
   tournament.player(2).rating     # =>  2556  (ICU rating)
-  
+
   tournament = parser.parse_file('ncc', "2010-05-08", :id => :intl, :rating => :intl)
   tournament.player(2).id         # =>  1205064 (FIDE ID)
   tournament.player(2).rating     # =>  2530    (FIDE rating)
@@ -78,10 +78,6 @@ Should you wish to rank the tournament using a different set of tie-break rules,
   tournament.tie_breaks = [:wins, :blacks]
   swiss_perfect = tournament.rerank.renumber.serialize('SwissPerfect')
 
-== Todo
-
-* Implement the extra tie-break rules that SP has
-
 =end
 
     class SwissPerfect
@@ -182,9 +178,10 @@ Should you wish to rank the tournament using a different set of tie-break rules,
                 ext = $2.downcase
                 stem[ext] = stm
                 tmp = Tempfile.new(e.name)
-                tmp.close
-                e.extract(tmp.path) { true }
-                temp[ext] = tmp.path
+                pth = tmp.path
+                tmp.close!
+                e.extract(pth) { true }
+                temp[ext] = pth
               end
             end
             %w(ini trn sco).each { |ext| raise "no #{ext.upcase} file found" unless stem[ext] }
@@ -210,17 +207,17 @@ Should you wish to rank the tournament using a different set of tie-break rules,
           @t.send("#{key}=", val) if val.size > 0
         end
         @t.tie_breaks = ini['Standings']['Tie Breaks'].to_s.split(/,/).map do |tbid|
-          case tbid.to_i             # tie break name in SwissPerfect
-          when 1217 then :buchholz   # Buchholz
-          when 1218 then :harkness   # Median Buchholz
-          when 1219 then nil         # Progress        - not implenented yet
-          when 1220 then :neustadtl  # Berger          
-          when 1221 then nil         # Rating Sum      - not implemented yet
-          when 1222 then :wins       # Number of Wins  
-          when 1223 then nil         # Minor Scores    - not applicable
-          when 1226 then nil         # Brightwell      - not applicable
+          case tbid.to_i              # tie break name in SwissPerfect
+          when 1217 then :buchholz    # Buchholz
+          when 1218 then :harkness    # Median Buchholz
+          when 1219 then :progressive # cumulative
+          when 1220 then :neustadtl   # Berger
+          when 1221 then :ratings     # rating sum
+          when 1222 then :wins        # number of wins
+          when 1223 then nil          # minor scores - not applicable
+          when 1226 then nil          # Brightwell   - not applicable
           else nil
-          end 
+          end
         end.find_all { |tb| tb }
       end
 

data/lib/icu_tournament/version.rb

@@ -1,5 +1,5 @@
 module ICU
   class Tournament
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/spec/tournament_sp_spec.rb

@@ -49,7 +49,7 @@ module ICU
         end
 
         it "should have the correct tie breaks" do
-          @t.tie_breaks.join('|').should == "buchholz|harkness"
+          @t.tie_breaks.join('|').should == "buchholz|harkness|progressive"
         end
 
         it "should serialize to the text export format" do
@@ -116,7 +116,7 @@ module ICU
         end
 
         it "should have the correct tie breaks" do
-          @t.tie_breaks.join('|').should == "harkness|buchholz"
+          @t.tie_breaks.join('|').should == "harkness|buchholz|progressive"
         end
       end
 
@@ -271,14 +271,6 @@ module ICU
           @t.player(8).signature.should  == "Vega, Marcos Llaneza||2475|3.0|16|1234|DDWW|BWBW|TTTT"
           @t.player(67).signature.should == "Lee, Shane|780|1633|1.0|52|134|DLD|WWW|TTT"
         end
-
-        it "should have correct details for selection of players, including international IDs and ratings when so configured" do
-          @t = @p.parse_file(SAMPLES + 'ncc', "2010-05-08", :id => :intl, :rating => :intl)
-          @t.player(2).signature.should  == "Szabo, Gergely|1205064||4.0|4|1234|WWWW|WBWB|TTTT"
-          @t.player(5).signature.should  == "Daly, Colm|2500434||3.5|7|1234|WWWD|WBWB|TTTT"
-          @t.player(8).signature.should  == "Vega, Marcos Llaneza|2253585||3.0|16|1234|DDWW|BWBW|TTTT"
-          @t.player(67).signature.should == "Lee, Shane|||1.0|52|134|DLD|WWW|TTT"
-        end
       end
     end
   end

data/spec/tournament_spec.rb

@@ -16,7 +16,7 @@ module ICU
         end.should_not raise_error
       end
     end
-    
+
     context "documentation example" do
       before(:each) do
         @t = t = ICU::Tournament.new('Bangor Masters', '2009-11-09')
@@ -35,12 +35,12 @@ module ICU
 001   30      Orr,Mark                                                           0.5    3    10 b =    20 w 0          
 EOS
       end
-      
+
       it "should serialize to Krause" do
         parser = ICU::Tournament::Krause.new
         parser.serialize(@t).should == @s
       end
-    end 
+    end
 
     context "name" do
       before(:each) do
@@ -57,8 +57,8 @@ EOS
       end
 
       it "should not be blank or without letters" do
-        lambda { Tournament.new('   ', '2009-11-09') }.should raise_error(/invalid.*name/)       
-        lambda { @t.name = '333' }.should raise_error(/invalid.*name/)   
+        lambda { Tournament.new('   ', '2009-11-09') }.should raise_error(/invalid.*name/)
+        lambda { @t.name = '333' }.should raise_error(/invalid.*name/)
       end
     end
 
@@ -262,17 +262,17 @@ EOS
         lambda { @t.time_control = 'abc' }.should raise_error(/invalid.*time.*control/)
       end
     end
-    
+
     context "tie breaks" do
       before(:each) do
         @t = Tournament.new('Edinburgh Masters', '2009-11-09')
       end
-      
+
       it "should an empty tie breaks list by default" do
         @t.tie_breaks.should be_an_instance_of(Array)
         @t.tie_breaks.should be_empty
       end
-      
+
       it "should be settable to one or more valid tie break methods" do
         @t.tie_breaks = [:neustadtl]
         @t.tie_breaks.join('|').should == "neustadtl"
@@ -283,11 +283,11 @@ EOS
         @t.tie_breaks = []
         @t.tie_breaks.join('|').should == ""
       end
-      
+
       it "should rasie an error is not given an array" do
         lambda { @t.tie_breaks = :neustadtl }.should raise_error(/array/i)
       end
-      
+
       it "should rasie an error is given any invalid tie-break methods" do
         lambda { @t.tie_breaks = ["My Bum"] }.should raise_error(/invalid/i)
         lambda { @t.tie_breaks = [:neustadtl, "Your arse"] }.should raise_error(/invalid/i)
@@ -370,7 +370,7 @@ EOS
         @t.find_player(Player.new('John', 'Orr', 4, :fed => 'IRL')).should be_nil
       end
     end
-    
+
     context "teams" do
       before(:each) do
         @t = Tournament.new('Bangor Bash', '2009-11-09')
@@ -382,20 +382,20 @@ EOS
         @t.get_team('  wandering  dragons  ').should be_an_instance_of Team
         @t.get_team('Blundering Bishops').should be_nil
       end
-      
+
       it "should be able to create and add a new team and retrieve it" do
         @t.add_team('Blundering Bishops').should be_an_instance_of Team
         @t.get_team('  blundering  bishops  ').should be_an_instance_of Team
         @t.get_team('Wandering Dragons').should be_nil
       end
-      
+
       it "should throw and exception if there is an attempt to add a team with a name that matches an existing team" do
         lambda { @t.add_team('Blundering Bishops') }.should_not raise_error
         lambda { @t.add_team('Wandering Dragons') }.should_not raise_error
         lambda { @t.add_team('  wandering   dragons  ') }.should raise_error(/similar.*exists/)
       end
     end
-    
+
     context "validation" do
       before(:each) do
         @t = Tournament.new('Edinburgh Masters', '2009-11-09')
@@ -465,7 +465,7 @@ EOS
         @t.player(3).rank = 3
         lambda { @t.validate! }.should raise_error(/player 2.*above.*player 1/)
       end
-      
+
       it "should be valid if there are teams, every player is in one of them, and no team has an invalid member" do
         team1 = Team.new('International Masters')
         team2 = Team.new('World Champions')
@@ -479,7 +479,7 @@ EOS
         team1.add_member(4)
         @t.invalid.should match(/not.*valid/)
       end
-      
+
       it "should not be valid if one player is in more than one team" do
         team1 = Team.new('XInternational Masters')
         team1.add_member(1)
@@ -493,7 +493,7 @@ EOS
         @t.invalid.should match(/already.*member/)
       end
     end
-    
+
     context "renumbering" do
       before(:each) do
         @t = Tournament.new('Edinburgh Masters', '2009-11-09')
@@ -504,7 +504,7 @@ EOS
         @t.add_result(Result.new(2, 30, 'W', :opponent => 10))
         @t.add_result(Result.new(3, 20, 'W', :opponent => 30))
       end
-      
+
       it "sample tournament is valid but unranked" do
         @t.invalid.should be_false
         @t.player(10).rank.should be_nil
@@ -518,7 +518,7 @@ EOS
         @t.players.map{ |p| p.num }.join('|').should == '1|2|3'
         @t.players.map{ |p| p.last_name }.join('|').should == 'Fischer|Kasparov|Orr'
       end
-      
+
       it "should be renumberable by rank if the tournament is ranked" do
         @t.rerank.renumber
         @t.invalid.should be_false
@@ -526,7 +526,7 @@ EOS
         @t.players.map{ |p| p.rank }.join('|').should == '1|2|3'
         @t.players.map{ |p| p.last_name }.join('|').should == 'Orr|Kasparov|Fischer'
       end
-      
+
       it "should be renumberable by name even if the tourament is ranked" do
         @t.rerank.renumber(:name)
         @t.invalid.should be_false
@@ -545,12 +545,12 @@ EOS
     context "reranking" do
       before(:each) do
         @t = Tournament.new('Edinburgh Masters', '2009-11-09')
-        @t.add_player(@boby = Player.new('Bobby', 'Fischer', 1))
-        @t.add_player(@gary = Player.new('Gary', 'Kasparov', 2))
+        @t.add_player(@boby = Player.new('Bobby', 'Fischer', 1, :rating => 2600))
+        @t.add_player(@gary = Player.new('Gary', 'Kasparov', 2, :rating => 2700))
         @t.add_player(@boby = Player.new('Micky', 'Mouse', 3))
-        @t.add_player(@boby = Player.new('Minnie', 'Mouse', 4))
-        @t.add_player(@boby = Player.new('Gearoidin', 'Ui Laighleis', 5))
-        @t.add_player(@mark = Player.new('Mark', 'Orr', 6))
+        @t.add_player(@boby = Player.new('Minnie', 'Mouse', 4, :rating => 1500))
+        @t.add_player(@boby = Player.new('Gearoidin', 'Ui Laighleis', 5, :rating => 1700))
+        @t.add_player(@mark = Player.new('Mark', 'Orr', 6, :rating => 2300))
         @t.add_result(Result.new(1, 1, 'W', :opponent => 6, :colour => 'W'))
         @t.add_result(Result.new(2, 1, 'W', :opponent => 3, :colour => 'B'))
         @t.add_result(Result.new(3, 1, 'W', :opponent => 5, :colour => 'W'))
@@ -566,13 +566,13 @@ EOS
         @t.invalid.should be_false
         @t.player(1).rank.should be_nil
       end
-      
+
       it "should have correct default tie break scores" do
         scores = @t.tie_break_scores
         scores[1].should == 'Fischer, Bobby'
         scores[5].should == 'Ui Laighleis, Gearoidin'
       end
-      
+
       it "should have correct actual scores" do
         @t.player(1).points.should == 3.0
         @t.player(2).points.should == 3.0
@@ -581,7 +581,7 @@ EOS
         @t.player(5).points.should == 0.5
         @t.player(6).points.should == 0.5
       end
-      
+
       it "should have correct Buchholz tie break scores" do
         @t.tie_breaks = ["Buchholz"]
         scores = @t.tie_break_scores
@@ -592,7 +592,7 @@ EOS
         scores[5].should == 6.5
         scores[6].should == 4.5
       end
-      
+
       it "Buchholz should be sensitive to unplayed games" do
         @t.player(1).find_result(1).opponent = nil
         @t.player(6).find_result(1).opponent = nil
@@ -605,7 +605,29 @@ EOS
         scores[5].should == 6.5  # 3 from Fischer changed to 2.5, 0.5 from Orr changed to 1 (cancels out)
         scores[6].should == 1.5  # 3 from Fischer changed to 0
       end
-      
+
+      it "should have correct progressive tie break scores" do
+        @t.tie_breaks = [:progressive]
+        scores = @t.tie_break_scores
+        scores[1].should == 6.0
+        scores[2].should == 6.0
+        scores[3].should == 3.0
+        scores[4].should == 1.0
+        scores[5].should == 1.0
+        scores[6].should == 1.0
+      end
+
+      it "should have correct ratings tie break scores" do
+        @t.tie_breaks = ['ratings']
+        scores = @t.tie_break_scores
+        scores[1].should == 4000
+        scores[2].should == 3200
+        scores[3].should == 6800
+        scores[4].should == 5000
+        scores[5].should == 7600
+        scores[6].should == 5800
+      end
+
       it "should have correct Neustadtl tie break scores" do
         @t.tie_breaks = [:neustadtl]
         scores = @t.tie_break_scores
@@ -616,7 +638,7 @@ EOS
         scores[5].should == 0.25
         scores[6].should == 0.25
       end
-      
+
       it "Neustadtl should be sensitive to unplayed games" do
         @t.player(1).find_result(1).opponent = nil
         @t.player(6).find_result(1).opponent = nil
@@ -629,7 +651,7 @@ EOS
         scores[5].should == 0.5  # 0.25 from Orr changed to 0.5
         scores[6].should == 0.25 # loss against Fisher and unplayed against Fisher equivalent
       end
-      
+
       it "should have correct Harkness tie break scores" do
         @t.tie_breaks = ['harkness']
         scores = @t.tie_break_scores
@@ -640,7 +662,7 @@ EOS
         scores[5].should == 3.0
         scores[6].should == 1.0
       end
-      
+
       it "should have correct Modified Median tie break scores" do
         @t.tie_breaks = ['Modified Median']
         scores = @t.tie_break_scores
@@ -651,14 +673,14 @@ EOS
         scores[5].should == 3.5
         scores[6].should == 1.5
       end
-      
+
       it "should have correct tie break scores for number of blacks" do
         @t.tie_breaks = ['Blacks']
         scores = @t.tie_break_scores
         scores[3].should == 0
         scores[4].should == 2
       end
-      
+
       it "number of blacks should should be sensitive to unplayed games" do
         @t.player(2).find_result(1).opponent = nil
         @t.player(4).find_result(1).opponent = nil
@@ -667,14 +689,14 @@ EOS
         scores[3].should == 0
         scores[4].should == 1
       end
-      
+
       it "should have correct tie break scores for number of wins" do
         @t.tie_breaks = [:wins]
         scores = @t.tie_break_scores
         scores[1].should == 3
         scores[6].should == 0
       end
-      
+
       it "number of wins should should be sensitive to unplayed games" do
         @t.player(1).find_result(1).opponent = nil
         @t.player(6).find_result(1).opponent = nil
@@ -693,7 +715,7 @@ EOS
         @t.player(6).rank.should == 5  # 0.5/"Ui"
         @t.player(5).rank.should == 6  # 0.5/"Orr"
       end
-    
+
       it "should be configurable to use Buchholz" do
         @t.tie_breaks = ['Buchholz']
         @t.rerank
@@ -704,7 +726,7 @@ EOS
         @t.player(5).rank.should == 5  # 0.5/6.5
         @t.player(6).rank.should == 6  # 0.5/4.5
       end
-      
+
       it "should be configurable to use Neustadtl" do
         @t.tie_breaks = [:neustadtl]
         @t.rerank
@@ -715,7 +737,7 @@ EOS
         @t.player(6).rank.should == 5  # 0.5/0.25/"Orr"
         @t.player(5).rank.should == 6  # 0.5/0.25/"Ui"
       end
-      
+
       it "should be configurable to use number of blacks" do
         @t.tie_breaks = [:blacks]
         @t.rerank
@@ -726,7 +748,7 @@ EOS
         @t.player(6).rank.should == 5  # 0.5/2
         @t.player(5).rank.should == 6  # 0.5/1
       end
-      
+
       it "should be configurable to use number of wins" do
         @t.tie_breaks = [:wins]
         @t.rerank
@@ -737,13 +759,13 @@ EOS
         @t.player(6).rank.should == 5  # 0.5/0/"Orr"
         @t.player(5).rank.should == 6  # 0.5/0/"Ui"
       end
-      
+
       it "should exhibit equivalence between Neustadtl and Sonneborn-Berger" do
         @t.tie_breaks = ['Sonneborn-Berger']
         @t.rerank
         (1..6).inject(''){ |t,r| t << @t.player(r).rank.to_s }.should == '213465'
       end
-      
+
       it "should be able to use more than one method" do
         @t.tie_breaks = [:neustadtl, :buchholz]
         @t.rerank
@@ -754,7 +776,7 @@ EOS
         @t.player(5).rank.should == 5  # 0.5/0.25/6.5
         @t.player(6).rank.should == 6  # 0.5/0.25/4.5
       end
-    
+
       it "should be possible as a side effect of validation" do
         @t.tie_breaks = [:buchholz]
         @t.invalid(:rerank => true).should be_false
@@ -765,7 +787,7 @@ EOS
         @t.player(5).rank.should == 5  # 1/6
         @t.player(6).rank.should == 6  # 0/5
       end
-      
+
       it "should be possible as a side effect of validation with multiple tie break methods" do
         @t.tie_breaks = [:neustadtl, :buchholz]
         @t.invalid(:rerank => true).should be_false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: icu_tournament
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Mark Orr