sanichi-chess_icu 0.4.6 → 0.4.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 4
-:patch: 6
+:patch: 7

data/lib/tournament.rb

@@ -153,6 +153,17 @@ with inconsitent ranking, it will be reranked (i.e. the method _rerank_ will be
       @round_dates[round-1]
     end
     
+    # Return the greatest round number according to the players results (which may not be the same as the set number of rounds).
+    def last_round
+      last_round = 0
+      @player.values.each do |p|
+        p.results.each do |r|
+          last_round = r.round if r.round > last_round
+        end
+      end
+      last_round
+    end
+
     # Set the tournament web site. Should be either unknown (_nil_) or a reasonably valid looking URL.
     def site=(site)
       @site = site.to_s.strip
@@ -319,11 +330,10 @@ with inconsitent ranking, it will be reranked (i.e. the method _rerank_ will be
     # if the number of rounds has been set, it should agree with the largest round from the results.
     def check_rounds
       round = Hash.new
-      round_last = 0
+      round_last = last_round
       @player.values.each do |p|
         p.results.each do |r|
           round[r.round] = true
-          round_last = r.round if r.round > round_last
         end
       end
       (1..round_last).each { |r| raise "there are no results for round #{r}" unless round[r] }

data/lib/tournament_krause.rb

@@ -190,12 +190,13 @@ The following lists Krause data identification numbers, their description and, w
           team.members.each{ |m| krause << sprintf(' %4d', m) }
           krause << "\n"
         end
-        if t.round_dates.size > 0
+        rounds = t.last_round
+        if t.round_dates.size == rounds && rounds > 0
           krause << "132 #{' ' * 85}"
           t.round_dates.each{ |d| krause << d.sub(/^../, '  ') }
           krause << "\n"
         end
-        t.players.each{ |p| krause << p.to_krause(t.rounds) }
+        t.players.each{ |p| krause << p.to_krause(rounds) }
         krause
       end
 

data/spec/tournament_krause_spec.rb

@@ -62,6 +62,7 @@ KRAUSE
         
         it "should have a number of rounds, a type and a time control" do
           @t.rounds.should       == 3
+          @t.last_round.should   == 3
           @t.type.should         == 'All-Play-All'
           @t.time_control.should == '60 in 2hr, 30 in 1hr, rest in 1hr'
         end
@@ -229,6 +230,31 @@ REORDERED
         end
       end
 
+      context "serialisation of a manually build tournament" do
+        before(:all) do
+          @krause = <<KRAUSE
+012 Las Vegas National Open
+042 2008-06-07
+001    1 w    Ui Laighleis,Gearoidin            1985 IRL     2501171 1964-06-10  1.0          2 b 0     3 w 1          
+001    2    m Orr,Mark                          2258 IRL     2500035 1955-11-09  2.0          1 w 1               3 b 1
+001    3    g Bologan,Viktor                    2663 MDA    13900048 1971-01-01  0.0                    1 b 0     2 w 0
+KRAUSE
+          @p = Krause.new
+          @t = Tournament.new('Las Vegas National Open', '2008-06-07')
+          @t.add_player(Player.new('Gearoidin', 'Ui Laighleis', 1, :rating => 1985, :id => 2501171,  :dob => '1964-06-10', :fed => 'IRL', :gender => 'f'))
+          @t.add_player(Player.new('Mark',      'Orr',          2, :rating => 2258, :id => 2500035,  :dob => '1955-11-09', :fed => 'IRL', :title => 'm'))
+          @t.add_player(Player.new('Viktor',    'Bologan',      3, :rating => 2663, :id => 13900048, :dob => '1971-01-01', :fed => 'MDA', :title => 'g'))
+          @t.add_result(ICU::Result.new(1, 1, 'L', :opponent => 2, :colour => 'B'))
+          @t.add_result(ICU::Result.new(2, 1, 'W', :opponent => 3, :colour => 'W'))
+          @t.add_result(ICU::Result.new(3, 2, 'W', :opponent => 3, :colour => 'B'))
+          @output = @p.serialize(@t)
+        end
+
+        it "should serialise manually build tournaments" do
+          @output.should == @krause
+        end
+      end
+
       context "errors" do
         before(:each) do
           @k = <<KRAUSE

data/spec/tournament_spec.rb

@@ -147,6 +147,25 @@ module ICU
       end
     end
 
+    context "last_round" do
+      before(:each) do
+        @t = Tournament.new('Edinburgh Masters', '2009-11-09')
+        @t.add_player(@mark = Player.new('Mark', 'Orr', 1))
+        @t.add_player(@gary = Player.new('Gary', 'Kasparov', 2))
+        @t.add_player(@boby = Player.new('Bobby', 'Fischer', 3))
+      end
+
+      it "depends on the players results" do
+        @t.last_round.should == 0
+        @t.add_result(Result.new(1, 1, 'W', :opponent => 2))
+        @t.last_round.should == 1
+        @t.add_result(Result.new(2, 2, 'D', :opponent => 3))
+        @t.last_round.should == 2
+        @t.add_result(Result.new(5, 3, 'L', :opponent => 1))
+        @t.last_round.should == 5
+      end
+    end
+
     context "round date" do
       before(:each) do
         @t = Tournament.new('Edinburgh Masters', '2009-11-09')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sanichi-chess_icu
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - Mark Orr